Merging sprint's work

Schedulement bug fixes, such as time validation(if end time is "bigger" than start time), device schedulement lock