FINISHED MAP
Test
Test
Merge branch 'ClementNg' into coredata_drives_me_crazy
merge daniel's