SO for login user
Merge branch 'master' of https://github.com/niralittle/Notus

Conflicts:
	NotusOSS-war/web/WEB-INF/JSP-contents/selectLocation-content.jsp
Merge branch 'master' of https://github.com/niralittle/Notus
some names were changed
Merge branch 'master' of https://github.com/niralittle/Notus
Merge branch 'master' of https://github.com/niralittle/Notus
issue #38 closed