Moved secrets out of settings.py into secrets.json.
Added south and set up initial migration.
Merge remote-tracking branch 'origin/master'

Conflicts:
	cmv_app/admin.py
	cmv_project/settings.py
added some front-end stuff