test free time search
Merge remote-tracking branch 'origin/master'

Conflicts:

	TaskManagerProject/src/manager/datamanager/test/FreeTimeSlotManagerTest.java