Merge pull request #689 from jnarron/havoc

Restored original jsps and other files, code cleanup, added UserService