promotion
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/index/eventdetail.blade.php
	app/views/index/master.blade.php