JavaDocs added to Assignment in Model
Merge remote-tracking branch 'origin/master'

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