Merge branch 'develop' of github.com:wp-premium/gravityforms into dev…

…elop

# Conflicts:
#	change_log.txt
#	common.php
#	css/admin.css
#	css/admin.min.css
#	css/font-awesome.css
#	css/font-awesome.min.css
#	css/forms.min.css
#	css/formsmain.css
#	css/formsmain.min.css
#	css/rtl.css
#	css/rtl.min.css
#	entry_detail.php
#	export.php
#	form_display.php
#	form_settings.php
#	forms_model.php
#	gravityforms.php
#	includes/addon/class-gf-addon.php
#	includes/addon/class-gf-feed-addon.php
#	includes/addon/class-gf-payment-addon.php
#	includes/addon/css/gaddon_settings.css
#	includes/addon/css/gaddon_settings.min.css
#	includes/addon/js/repeater.min.js
#	includes/class-gravity-api.php
#	includes/fields/class-gf-field-address.php
#	includes/fields/class-gf-field-fileupload.php
#	includes/fields/class-gf-field-phone.php
#	includes/fields/class-gf-field.php
#	js/conditional_logic.js
#	js/conditional_logic.min.js
#	js/form_admin.js
#	js/form_admin.min.js
#	js/gravityforms.js
#	js/gravityforms.min.js
#	languages/gravityforms-da_DK.mo
#	languages/gravityforms-es_ES.mo
#	languages/gravityforms-fi.mo
#	languages/gravityforms-fr_FR.mo
#	languages/gravityforms-pt_BR.mo
#	languages/gravityforms-sv_SE.mo
#	languages/gravityforms.pot
#	notification.php
#	preview.php