A
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/UsersController.php
	app/database/migrations/2014_10_31_130857_create_Run_User_table.php
	app/views/runs/registerStep2.blade.php