Updates
Merge branch 'develop'

Conflicts:
	login.php
	templates/user/login.tpl