dan: implement navbar in pdf reader
Merge branch 'master' into fix-navbar-in-reader

Conflicts:
	app/assets/stylesheets/pdf/viewer.css
Merge pull request #65 from gopher-snakes-2013/fix-navbar-in-reader

Fix navbar in reader