Merge remote-tracking branch 'origin/master'

Conflicts:

	Gamefication/bin/com/esfinge/gamefication/mechanics/TestGameToDatabase.class

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