edit employment page  and fixed a bug in edit account page.
Merge branch 'master' of https://github.com/hoorncj/RoseInternships

Conflicts:
	www/userProfile.php