Profile fixes
Merge branch 'master' of https://github.com/lpissinali/school

Conflicts:
	page4-child2-quiz.php