Updated location service, updated #10
Merge branch 'master' of https://github.com/LynxUA/Netcracker-Sunflower

Conflicts:
	web/web/WEB-INF/web.xml