Fixed a warning message when using ruby >= 2.0.0: syck is used if it is defined, otherwise psych (the new default one) will be used
Adding missing ruby's 2.0 gems
Fixing invalid yaml
Fixed issue 1342 - groups not being rendered under assignment tab
I fix issue 1360. Rendering the group to be shown in Assignment tab under graders.
Merge pull request #1372 from cj343/issue-1360

Closes #1360
Merge pull request #1370 from akittels/issue-1342

Closes #1342 - groups not being rendered under assignment tab
Merge pull request #1368 from tiagochst/issue-1367

Closes #1367
Merge pull request #1366 from tiagochst/issue-1365

Closes #1365: Adding missing ruby's 2.0 gems
Merge pull request #1364 from tiagochst/issue-1363

Closes #1363
Merge remote-tracking branch 'upstream/master' into issue-1361

Conflicts:
	app/controllers/graders_controller.rb
	app/controllers/groups_controller.rb