Dodanie restowego controlera
Merge branch 'master' of https://github.com/Kosorith/IOGeocaching

Conflicts:
	server/server/pom.xml