Integration Google Maps & Twitter
Merge conflict solved