Get MainActivity.java from Master to make things mergable