Changing build system from Ant to Gradle.
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/project.properties