festivals
Merge branch 'master' of https://github.com/masterALMA2016/openDataWrapper

Conflicts:
	src/main/resources/mapping.properties