views festival, disco, bar, thuis
Merge branch 'feature/barview_v2' into develop

Conflicts:
	application/controllers/location.php
	application/views/bar.php
Merge branch 'develop' of https://github.com/crazytim412/ipmedt7 into develop