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

Conflicts:
	com/thevillage/Building.as
	com/thevillage/CropField.as
	village.fla
	village.swf