fixed migrations, started trainer dashboard
Merge branch 'master' of https://github.com/Evercise/evercise

Conflicts:
	app/controllers/UsersController.php