Fixed typo error
Merge pull request #31 from kzisme/master

Fixed typo error
Merge branch 'master' into development

Conflicts:
	json/locations.json