[V2S3 US 58618384] Note panel opening from search panel
Fix conflicts

Conflicts:
	ginco-admin/src/main/webapp/app/controller/GlobalThesaurusTabsPanelController.js
	ginco-impl/src/main/java/fr/mcc/ginco/solr/ExtEntityType.java