Sort employees modified
Merge branch 'dev' of https://github.com/engsyst/ftua into dev
Bugs in Schedule.generate()
Merge remote-tracking branch 'origin/dev' into dev
generate moved to ScheduleManagerServiceImpl
Merge remote-tracking branch 'origin/dev' into Gen

Conflicts:
	FitnessUA/.settings/com.google.gwt.eclipse.core.prefs
	FitnessUA/src/ua/nure/ostpc/malibu/shedule/entity/Schedule.java
Debug version of gen
Merge remote-tracking branch 'origin/dev' into Gen

Conflicts:
	FitnessUA/src/ua/nure/ostpc/malibu/shedule/entity/Schedule.java
Merge remote-tracking branch 'origin/dev' into Gen