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