Move some stuff around for fun
Merge remote-tracking branch 'upstream/feature/fund-apps' into feature/fund-apps

Conflicts:
	bluebottle/bb_payments/templates/bb_payments/base.hbs