Merge branch '3.1.x'
Merge branch '3.1.x'
Improved the language on Student Result Mode help text
Fix bug upgrading from 2.x and add utf8 for mysql connection for upgrade
Bump version to 3.1.3
Merge branch '3.1.x'
added individual criterion comments to the rubric csv export
fixed broken link for adding survey questions when using

mod_userdir configuration
added pseudo data for rubric view

The reason there were invalid indices error is because the pseudo
data did not include some of the required informations.
Merge branch 'rubric_comments' into dev

Conflicts:
	app/views/events/add.ctp
	app/views/events/edit.ctp
Merge branch 'broken_link' into dev

Conflicts:
	app/libs/toolkit.php
	app/views/surveys/questionssummary.ctp