Renamed maps
Merge branch 'master' of github.com:fm2munsh/Pokemon

Conflicts:
	public/js/modules/animation.js
	public/js/modules/people.js
	public/js/modules/scenes.js