Merge branch 'master' of github.com:ridget/transactions

Conflicts:
	app/helpers/to-currency.js