Manifest map + merge incoming bitch
Merge branch 'master' of https://github.com/fulleco/moveon
Iteration 2 : map basique