Merge MainActivity with RotationSensorActivity
Correction of a conflict (MainActivity.java)