evaluations first
glyphicons
Batch File Uploads
Merge branch 'master' into eval1

Conflicts:
	app/controllers/courses_controller.rb
Merge branch 'eval1'
cosmetic fixes

glyph icons, nag menu toggle, cleaned up =>'s to :'s, hopefully to get
that error to go away. div fixes.
moar cosmetic fixes
last fixes
Merge branch 'december-fest'