Merge origin/master

Conflicts:
	project/viewcart.php

invalid email address error display
Show username