tmp
Merge branch 'master' of github.com:wanmaple/Pokemon

Conflicts:
	Pokemon/src/framework/commonLib.lua
rename terrain sizes