Novos testes de anotação
Merge branch 'master' of https://github.com/EsfingeFramework/gamification

Conflicts:

	Gamefication/bin/com/esfinge/gamification/mechanics/GameDatabaseStorage.class

	Gamefication/bin/com/esfinge/gamification/mechanics/GameFileStorage.class

	Gamefication/src/com/esfinge/gamification/mechanics/GameDatabaseStorage.java

	Gamefication/src/com/esfinge/gamification/mechanics/GameFileStorage.java
Revert "Merge branch 'master' of https://github.com/EsfingeFramework/gamification"

This reverts commit bc342d6130a0840812ce6d53f88a60c2bf0fc346.
Merge branch 'master' of https://github.com/EsfingeFramework/gamification

Conflicts:

	Gamefication/src/com/esfinge/gamification/mechanics/database/RankingStorage.java

	Gamefication/src/com/esfinge/gamification/mechanics/database/RewardStorage.java

	Gamefication/src/com/esfinge/gamification/mechanics/database/StorageFactory.java

	Gamefication/src/com/esfinge/gamification/mechanics/database/TrophyStorage.java