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

Signed-off-by: yoPitarch <pitarch@irit.fr>

Conflicts:
	target/classes/coria2015/geoencoding/GeoNamesFinder.class
	target/classes/coria2015/geoencoding/TestGeoNamesFinder.class
	target/classes/coria2015/server/JsonRPCMethods.class
	target/classes/web/css/styles.css
	target/classes/web/images/icon.png
	target/classes/web/images/icon.xcf
	target/classes/web/index.html
	target/classes/web/javascript/functions.js