add method getUserByID
Merge branch 'master' of https://github.com/niralittle/Notus

Conflicts:
	NotusOSS-war/src/java/nc/notus/TestDAO.java