Android Studio: Fix Lite Edition\'s main layout file
Merge branch 'android/gradle' into issue/96-list-fragment

Conflicts:
	gradle/android/src/lite/res/layout/main.xml