Fixing My Account link in Login Page and Page User Logic
Merge branch 'master' of github.com:1834Software/wakenshake-website

Conflicts:
	page-user.php