Fix comment
Fix scrolling in tests
Android Studio Beta: Update gradle plugin version
Android Beta: Remove `.idea` directory
Android Studio Beta: Update AndroidManifest files for new merge
Merge branch 'devel/android' into android/studio-beta

Conflicts:
	gradle/android/src/lite/AndroidManifest.xml
	gradle/gradle/wrapper/gradle-wrapper.properties
Fix AndroidManifest for Lite Edition
Export ContentProvider from Lite Edition
Android Studio Beta: Fix Lite's manifest
Merge pull request #298 from codeguru42/android/tests

Android/tests
Merge pull request #302 from codeguru42/android/studio-beta

Android Studio Beta
Merge pull request #301 from codeguru42/android/premium

Fix bug in Lite's ContentProvider