fixing account, and volunteer
Merge origin/master

Conflicts:
	login/view/loginpage.php