Started on migrations
Merge branch 'master' into logs-fix

Conflicts:
	log/development.log