Merge branch 'master' of github.com:ch3ck3r/mathetest

Conflicts:
	htdocs/css/common.css
	htdocs/protected/views/task/_form.php