frontend page navigation
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/development/app.controller.js