v2
Merge remote-tracking branch 'origin/master'

Conflicts:
	bills.manifest
	index.html
	js/src/controllers/billsCtrl.js
	scss/app.scss
	scss/src/components/toolbar.scss
	views/bills/list.html