tpl changes for default style added
Merge remote-tracking branch 'origin/php-basic' into php-basic

Conflicts:
	webroot/style/default/tpl/tpl_grades_add.html