Fixed several bugs.  Started implementing new theming support.
Merge branch 'bs3'

Conflicts:
	.gitignore
	app/models/exercise.rb
	app/views/exercises/_search.html.haml
	config/routes.rb