dev alp
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/Default/login.php
	themes/Default/register.php