Enhancement
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	index.php
	php/models/Gig.php
	php/views/gigs/sidebar.php