added grades
local changes
Merge branch 'master' of https://github.com/UOC/la

Conflicts:
	query/config/settings.js
	query/indexmatricula.js
	query/matricula.js