Added some fields
Merge branch 'master' of https://github.com/arzhed/AI-schedule

Conflicts:
	TAallocation.java