first Comit new Branch rpg-12
[RPG-12] Added sample map.
[RPG-12] Corrected one path in sample map.
Merge branch 'RPG-12'
hot fix
Merge branch 'master' into sleep_mode

Conflicts:
	public/js/person.js