add basic rhs navbar
Merge branch 'master' of github.com:paperhub/paperhub-frontend
add angular-route dependency
Merge branch 'master' of github.com:paperhub/paperhub-frontend

Conflicts:
	gulpfile.js