can list users, and almost add users
Merge branch 'master' of https://github.com/jonathanklingberg/ETSN05.git

Conflicts:
	src/base/AdministrationComponent.java
	src/base/ServletBase.java
Merge branch 'master' of https://github.com/jonathanklingberg/ETSN05.git

Conflicts:
	src/base/AdministrationComponent.java
	src/base/ServletBase.java