Fix compiler
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/SAVANT.apk
	bin/classes/.gitignore
	bin/resources.ap_