-
Merge branch 'master' of https://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/lib/HttpHelper.class
	bin/classes/com/ifree/lib/UIHelper.class
	bin/classes/com/ifree/lib/onLoadNewVersionAndRun.class
	bin/classes/com/ifree/timeattendance/TabReference.class
	bin/dexedLibs/android-support-v4-9e52a7fcbad2a4ac513001bbab8ed1cd.jar
	bin/resources.ap_
	bin/test6.apk
-
Merge branch 'master' of https://github.com/vano99x/folder_1

Conflicts:
	bin/classes/com/ifree/CheckinList/CheckinAdapter3.class
	bin/classes/com/ifree/lib/UIHelper.class
	bin/classes/com/ifree/timeattendance/MainEngine$1.class
	bin/test6.apk