-Javadox for dat User, Employee and da Login class.
Merge origin/master