chnage plan
chnage plan
Merge branch 'braintree' into develop

Conflicts:
	wp-content/themes/binpress/SPA/apps/plans/change-plan/change-plan-controller.js
	wp-content/themes/binpress/SPA/apps/plans/list/list-plans-controller.js
Merge branch 'develop' of https://github.com/ajency/BenSmiley into develop
chnage plan