Merge remote-tracking branch 'origin/master'

Conflicts:
	cmv_app/admin.py
	cmv_project/settings.py
added some front-end stuff
added some bootstrap
modified templates
merged changes
merged all changes with new frontend
fixed minor bugs