Generic bootstrap navbar
Merge branch 'master' of https://github.com/lmerriam/CDAI

Conflicts:
	app/assets/javascripts/templates/application.emblem