Updates to editing account
Merge branch 'master' of https://github.com/moosemn456/lightwait

Conflicts:
	Web/api/index.php