minor change to migrations
Merge branch 'sentry-and-ajax-merge' of https://github.com/tristanallen/evercise into sentry-and-ajax-merge

Conflicts:

	app/database/migrations/2014_04_29_120131_create_user_has_marketingpreferences_table.php