Service catalog was created
Merge branch 'master' of https://github.com/niralittle/Notus

Conflicts:
	NotusOSS-war/web/WEB-INF/web.xml