changed name on parameter in the toHtml method in User
lifted attribute instance fron AdministrationComponent to ServletBase and replaced all 'WorkspaceInstance.getinstance(conn)' with 'instance'
Merge branch 'master' of https://github.com/jonathanklingberg/ETSN05