Merge branch 'master' of https://github.com/orisimo/TheVillage

Conflicts:
	com/thevillage/GameData.as
Merge branch 'master' of https://github.com/orisimo/TheVillage