add Berlin
Merge branch 'revolunet-berlin'
Update Toulouse Ombre Blanche: has power
Merge pull request #75 from AntoineCezar/update_toulouse_json

Update Toulouse Ombre Blanche: has power
Added Albi
Merge pull request #76 from AntoineCezar/albi

Added Albi
Add albi in the readme
Add mars planet
Merge pull request #77 from pointbar/master

Add mars planet
add link to marseille.devfriendlyplaces.net
Create dakar.json
Update locations.json
Merge pull request #78 and pull request  #79 from sciasoft
Update toulouse.json
Merge pull request #82 from Jean31/master

Update toulouse.json
fix a missing comma in toulouse.json
Four spaces everywhere
Merge pull request #83 from pointbar/remove-tabs1

Four spaces everywhere
Add La fiancée to Toulouse places
Merge pull request #84 from AntoineCezar/toulouse_add_lafiancee

Add La fiancée to Toulouse places