fix
Merge branch 'master' of https://github.com/andreborralho/festivAllClient.git

Conflicts:
	js/data.js