decouple from android dependencies
Merge remote-tracking branch 'origin/master'

Conflicts:
	gradle.properties