Revert "Merge branch 'master' of CG8250:hbuyse/AccroApp into feature/addDrawable"

This reverts commit a18eeacb5d18fbdf5b7e186dac8f4fce2331f5f5, reversing
changes made to 46bf2b6da2ff7914f7622d8c2bf50c354683e38f.