...
Merge branch 'master' of https://github.com/githuz/Disabled.git

Conflicts:
	AndroidManifest.xml