Merge branch 'hotfix/0.1.1' into develop
Change: update methods to use DI array notion
Add/change: merge subNav and mainNav factories into single file
Change: better subnav
New controllers and some new page factories
Change: changes to how pages are being traversed
Change: changes to how pages are being traversed
Merge branch 'develop' of github.com:niklas-r/angularjs-demo into develop

Conflicts:
	client/app/app.js
Add: taxes services files and setup
Add: county/tax list
Add: taxes functionallity for household calulator
Merge branch 'feature/taxes' into develop
Add: everybody loves comments
Something weird
Add: temporary calculator storage
Add: more validation to the household view
Bump version
Merge branch 'release/0.1.2'