Merge remote-tracking branch 'origin/master'

Conflicts:
	views/manage_participants.blade.php

2014/12/1-2