aaa
Merge github.com:vano99x/folder_1

Conflicts:
	bin/classes/com/ifree/timeattendance/MainEngine$onSaveCheckin.class