Merge
Merge branch 'master' of
git@github.com:BrunoPereiraSantos/NewSinkBet.git

Conflicts:
	src/projects/defaultProject/appConfig.xml