Merge branch 'issue_295' into develop

Conflicts:
	web/views/scripts/auth/signup.php