no message
no message
Merge branch 'master' of https://github.com/bpiwowar/foodmap

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/bpiwowar/foodmap