Merge remote-tracking branch 'digitalmediacenter/feature-event-browser'

Conflicts:
	puppetboard/templates/layout.html
Use url operator in macro