Conflit
Merge branch 'master' of https://github.com/Antho2407/Moveon-Android
dfzeregfg