Add Assignment is partially working.
Add Assignment is working partially
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/implementation/model/assignments_categories/Category.java