1
Merge branch 'master' of 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/TabReference.class
	bin/resources.ap_
	bin/test6.apk