'lots of changes to critique pages, login page'
Merge branch 'master' of http://github.com/domzheng/crtiq

Conflicts:
	templates/home_screen.php
	templates/welcome_form.php