Merged
Merge conflict resolve for TimeTabling.h