chnage edit plan view
chnage edit plan view
Merge branch 'braintree' into develop

Conflicts:
	wp-content/themes/binpress/SPA/loading/controller.js
Merge branch 'develop' of https://github.com/ajency/BenSmiley into develop

Conflicts:
	wp-content/themes/binpress/SPA/apps/plans/list/list-plan-view.js
	wp-content/themes/binpress/SPA/apps/plans/list/list-plans-controller.js