Erro
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gamefication/bin/com/esfinge/gamefication/mechanics/TestGame.class