fixed migrations and trainer block
?
put routes back
merge??
Merge branch 'master' of https://github.com/Evercise/evercise

Conflicts:
	app/composers.php