Move project from Eclipse to Android Studio and replace ant build system with gradle.
Merge remote-tracking branch 'origin/master'

Conflicts:
	TxtApp/proguard-rules.txt
	TxtApp/src/main/AndroidManifest.xml