yay
Conflicts:
	resources/map/Faires.map
Merge branch 'master' of https://github.com/alveyworld-dev/game