test GIT
Merge branch 'master' of https://github.com/Supreci/festival_maa

Conflicts:
	nbproject/private/private.properties