Merge remote-tracking branch 'upstream/master'
Add init map features
merge du taff de jeff
Merge remote-tracking branch 'upstream/master'
merge
Merge branch 'adrienbarreau-master'
Merge pull request #11 from jefBinomed/master

merge d'adrien