add model v.7, added work regime constraint, improved compactness constaraint with subgroups
Merge branch 'master' of github.com:aprex/timetabling

Conflicts:
	reports.pyc