Assignment Edit/Create/View Working

Small change to Bundle.properties as well.
Fixed Merge Conflicts

AssignmentController Merger Conflict
Merge branch 'master' of https://github.com/ryanm8/Planner-Of-The-Apes

Conflicts:
	src/java/com/brigreen/jsfclassespackage/AssignmentController.java