see log
Merge branch 'master' of https://github.com/supershazwi/IS3261

Conflicts:
	is3261project/bin/is3261project.apk
	is3261project/bin/resources.ap_