Changed the returned json object and how front end utilizes the new object format

EV-527
Updated addGoal() function header

EV-527
Updated addAssessment() to use gson and hashmaps

EV-527
Merge remote-tracking branch 'github/feature/EV-527-criteria-incorrectly-labeled' into liferay6