world
Merge branch 'master' of https://github.com/geoctrl/client-resman

Conflicts:
	img/world.png