Catalog test 4
Merge origin/master

Conflicts:
	src/main/java/controller/Catalog.java