fix migration
Merge branch 'master' of https://github.com/mccomaschris/sonsofmu

Conflicts:
	app/database/production.db