Commit from linux appConfig
Merge branch 'master' of
ssh://git@github.com/BrunoPereiraSantos/SinkBet.git

Conflicts:
	src/projects/defaultProject/appConfig.xml