fixed errorneus 'Empty catalog' message
Merge branch 'master' into beta
updated ChangeLog
Merge branch 'master' into beta

Conflicts:
	ChangeLog