update
Merge branch 'master' of https://github.com/giyyapan/magia

Conflicts:
	local/css/worldMap.css
	local/css/worldMap.less
hehe