Added the CategoryTree view class
Merge branch 'master' of https://github.com/jjfazio/308Grader

Conflicts:
	trunk/implementation/controller/assignments_categories/AddCategoryController.java