build level 3

iniisilisasi setting level 3
sync conflic repair

perbaiki sync conflic
Merge branch 'master' of https://github.com/rickyazhari/kancil

Conflicts:
	kancil.caproj
	kancil.capx.backup1
	kancil.uistate.xml