Added Criteria View Mode

Implemented a feature to display rubrics sorted by criteria as opposed to
being sorted by students.  Instructors will be able to select the view
mode when creating their rubric.  When selecting the view, instructors
will be shown an example of what the rubric will look like in either mode.  This feature only affects the student's view of the rubric, not the instructor's view.

This feature also required an upgrade to the database as it introduced a
new storage value for the view.  This value could either be: 'criteria' or
'student'.
Merge branch 'rubricLayoutB' into dev

Branch 'rubricLayoutB' includes a feature (Enhancement #392) to allow
rubrics to be organized by criteria rather than by students.  This
organization will only be visible to the students Instructors will be able to set the organization method (i.e. view mode) when creating the rubric.

Conflicts:
	app/controllers/evaluations_controller.php