Merge remote-tracking branch 'origin/master' into 198
Merge branch 'master' into 155

Conflicts:
	sites/all/themes/idevels/styles/styles.css
	sites/all/themes/idevels/template.php
Task #155: Hide show report link when event didn't past
Merge branch '155' into test

Conflicts:
	sites/all/themes/idevels/styles/styles.css
	sites/all/themes/idevels/template.php