Location
Merge branch 'master' of https://github.com/csabakassai/city-guide-for-glass

Conflicts:
	src/main/java/com/doctusoft/cityguide/MainServlet.java
	src/main/java/com/doctusoft/cityguide/entity/Place.java