update squash
update step 2 develop catalog
squash, rewrite commit
Merge branch 'dev_catalog2' into develop

* dev_catalog2:
  update step 2 develop catalog
Merge branch 'develop' into test_squash

* develop:
  update step 2 develop catalog

Conflicts:
	develop/develop_common.info
update after merge squash