Finished settings administration, changed upper headings to h1
Merge branch 'master' of github.com:ch3ck3r/mathetest

Conflicts:
	htdocs/protected/views/performTest/_taskHeader.php