Fix urls
Remove branching stuff and clean markup
Merge branch 'public' of gitorious.orinet.nce.amadeus.net:dataanalysis/geobases into public