giulio
Merge branch 'master' of https://github.com/dantt/H-ACK-Tourism-Wish--n-go

Conflicts:
	views/CustomEvents.html
	views/CustomEvents.js