Fix world generation
Refactor to avoid using variables named id
Fix typo resulting in move not working right
Modify world-gen code.
Merge remote-tracking branch 'origin/feature-fixeration' into develop

Conflicts:
	app_extension.py