modification button alert
Dev
test
Merge remote-tracking branch 'origin/devEric'

Conflicts:

MaMoyenne.xcodeproj/project.xcworkspace/xcshareddata/MaMoyenne.xccheckou
t