updated and fixed bug
here map
Merge branch 'master' of https://github.com/ireal-ki/1081009wp

Conflicts:
	index.html
	js/app.js