Integrating maps (WIP)
Merge branch 'master' of https://github.com/shrisha/springrest

Conflicts:
	src/main/resources/public/index.html