added all
merged routes.js
merged incomes filew
Merge branch 'dev' of https://github.com/bethnoble/my-tax-account into dev

Conflicts:
	views/includes/incomes_template.html
	views/navigation/incomes.html
Merge branch 'dev' of https://github.com/bethnoble/my-tax-account into dev
added hello partial and query support