fixed navigation
newest dev
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/app.js
newest dev