Merge branch 'master' into section_2

Conflicts:
	app/helpers/to-currency.js
Merge branch 'section_2' of github.com:ridget/transactions into section_2
wip on component in form