aaa
aaa
Merge github.com:vano99x/folder_1

Conflicts:
	bin/classes.dex
	bin/classes/com/example/test6/R$raw.class
	bin/classes/com/example/test6/R$string.class
	bin/classes/com/example/test6/R$style.class
	bin/classes/com/ifree/Database/Checkin.class
	bin/classes/com/ifree/lib/HttpHelper.class
	bin/classes/com/ifree/lib/UIHelper.class
	bin/classes/com/ifree/lib/onLoadNewVersionAndRun.class
	bin/classes/com/ifree/timeattendance/MainEngine$1.class
	bin/classes/com/ifree/timeattendance/MainEngine$onAuthenticateSV.class
	bin/classes/com/ifree/timeattendance/MainEngine$onSaveCheckin.class
	bin/classes/com/ifree/timeattendance/MainEngine$onSaveCheckin_CompleteEventHandler.class
	bin/classes/com/ifree/timeattendance/TabReference.class
	bin/resources.ap_
	bin/test6.apk
	src/com/ifree/lib/UpdateManager.java