Merge branch 'dev' into hotfix
Fix #450. Wrong data structure in formatRubricEvaluationResultsMatrix

Missing criteria ave in the data structure when the person doesn't have
any grade.
Merge branch 'dev' into hotfix
Add User Faculty label fix.

"admin only" doesn't make sense when instructors can also select
faculties.
Fix master question losing responses & deletion.

Fix master question losing responses:
Ticket #451: http://ipeer.ctlt.ubc.ca/trac/ticket/451

When a master question is loaded, the response array it returns includes
the ID number of the responses. Since responses can only belong to 1
question, this results in the new question co-opting ownership of these
responses.

Fix master question deletion:
All questions actually weren't being deleted for some reason. But only
the master questions show up as a symptom since they're the only ones
still accessible by the user after deletion. habtmDelete didn't properly
delete everything, added a manual delete as a quick fix.
Fix unable to add text answers to surveys.

The fix for master questions losing their responses caused this, now
fixed.
Fix #452, invalid id passed to action for simple eval
Fix survey save for "Choose any of" questions.

When saving a survey with a "Choose any of" question, the evaluation
component crashes with an unknown index error.

Fixed by refactoring the entire section dealing with saving survey
responses based on the question type. It looks like there was the
remanent of a system that was trying to save all responses in one
saveAll call, but it was never completed. It switched to each response
type saving their own survey input, leaving everything in a bit of a
mess.
Merge branch 'hotfix' of github.com:ubc/iPeer into hotfix
fixed Ticket 443

instructors were not able to edit groups. The reason was the url
connected to the edit form gave the course_id as the parameter
instead of the group_id. This has now been fixed.
fixed user edit form to be able to access faculty field

Previously, the edit form for editing instructors have the
faculty field greyed out. This has now been fixed.
Merge branch 'hotfix' of github.com:ubc/iPeer into hotfix
Fix 4432df6 where the change failed group add
Merge branch 'hotfix' into dev

Conflicts:
	app/views/groups/edit.ctp
	app/views/users/add.ctp