sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/jarlist.cache
	project.properties