REST: Accelerometre Android
resolve merge conflict