sample instructors do not belong to any faculties

I have editted the sample data sql file to create relationships
between instructor1, instructor2 and instructor3 and their
respective faculties.
Merge branch 'hotfix' into dev
fixed controller test cases

The url for some reasons included simpleevaluation as part of the
url which caused problems. The problem is now fixed by adding a '/'
in front of the controller.
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.
added an extra validation for the user form

If a super admin, faculty admin, or instructor is being added,
a minimum of one faculty must be selected.
Fix path in v1 controller test
Fix failed test cases, add superadmin to user_faculty table
Merge branch 'hotfix' into dev

Conflicts:
	app/views/groups/edit.ctp
	app/views/users/add.ctp
fixed a user form bug & add loop to assign faculty to super admin

= there was a bug introduced in an earlier commit that did not
allow super admins to be added if no faculties are selected.
However the faculty field is greyed out. It has now been fixed.
Adding super admins no longer required the faculty field to be
not empty.

= when a new faculty is added it is assigned to all super admins
in the system. However there was a bug where it only assigns the
last super admin on the list to the new faculty. This is fine
when there is only one super admin in the system, but when there
are more, the other super admins will not have access to the new
faculty. This has now been fixed by fixing how the array is
created.

= I have also added a similar loop in the users controller add
function. When a super admin is added to the system, it will go
through all the faculties in the system and create a relationship
between the faculties and the new super admin.
fixed checkstyle erros
Merge branch 'hotfix' into dev

Conflicts:
	app/tests/cases/controllers/v1_controller.test.php
made minor cosmetic changes

= sorted the list of other recipients for writing email in
alphabetical order so that it is user to find the desired users.
In production the list would be very long because the list
includes every user in the system except for the users already
added to the email.

= changed the field label for faculty for users/edit to
instructor/admin only from admin only because it has been changed
that instructors now belong to faculties.

= for simple_eval_form added a space between the number of
empty comment fields and the phrase "comments to be filled"
Merge branch 'dev' of github.com:ubc/iPeer into dev
Fix the incorrect URL in test
fixed checkbox css problem for "Zero Mark" - rubric
changed setting for simple eval preview

= made it the same as rubric and mixeval preview where the toggle
for the evaluation preview is opened.
fixed css for courses in user form

The labels were not inline with their checkbox. This has now been
fixed.
Updated guard plugin
Merge branch 'dev' of github.com:ubc/iPeer into dev
Merge branch 'hotfix' into dev

Conflicts:
	app/models/event.php
	app/webroot/css/ipeer.css