Server shit
Merge branch 'master' of https://github.com/tdubourg/geobombing

Conflicts:
	server/pgsql.js
Merge branch 'master' of https://github.com/tdubourg/geobombing
Fixed Aymeric's mistakes
DB rhone alpes
Merge branch 'master' of https://github.com/tdubourg/geobombing