Added salt stuff to UserDBAO and loginServlet
Merge branch 'new_master' into ET-Dev2