local changes on sandbox
gerge branch 'master' of https://github.com/foxydot/rendigs

Conflicts:
	wp-content/plugins/backupbuddy/css/jquery_smoothness.css
	wp-content/plugins/gravityforms/change_log.txt
	wp-content/plugins/gravityforms/common.php
	wp-content/plugins/gravityforms/export.php
	wp-content/plugins/gravityforms/form_detail.php
	wp-content/plugins/gravityforms/form_display.php
	wp-content/plugins/gravityforms/form_settings.php
	wp-content/plugins/gravityforms/forms_model.php
	wp-content/plugins/gravityforms/gravityforms.php
	wp-content/plugins/gravityforms/includes/addon/class-gf-addon.php
	wp-content/plugins/gravityforms/includes/addon/class-gf-auto-upgrade.php
	wp-content/plugins/gravityforms/includes/addon/class-gf-feed-addon.php
	wp-content/plugins/gravityforms/js/form_admin.js
	wp-content/plugins/gravityforms/js/gravityforms.js
	wp-content/plugins/gravityforms/select_columns.php
	wp-content/plugins/gravityforms/widget.php
Merge branch 'master' of https://github.com/foxydot/rendigs