Removing users within editPage.jsp does work

adding them still needs a fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/src/main/webapp/pages/user.jsp