UserCatalog added
Merge branch 'master' of https://github.com/samatase/saleBadgerJava.git

Conflicts:
	SaleBadger/src/main/java/app/model/User.java