Merge remote-tracking branch 'balanced/master' into initialDepositFix

Conflicts:
	app/models/factories/transaction_factory.js