Updated user screen to now use the backend instead of the complex js.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/web-resources/partials/users.html