retour en arrière
Merge branch 'master' of github.com:ISI-nc/fragaria-ui
Merge branch 'master' of github.com:ISI-nc/fragaria-ui
Merge branch 'master' of github.com:ISI-nc/fragaria-ui
Merge branch 'master' of https://github.com/ISI-nc/fragaria-ui
Separation des composants non dépendants de l'adapter
Création d'un filter pour l'initialisation du registry fragaria
Merge branch 'master' of https://github.com/ISI-nc/fragaria-ui

Conflicts:
	pom.xml
	src/main/java/nc/isi/fragaria_ui/components/ElasticAutocompletionSearch.java
	src/main/java/nc/isi/fragaria_ui/services/ElasticsearchConfig.java
	src/main/resources/nc/isi/fragaria_ui/components/BeanEditForm.tml
	src/main/resources/nc/isi/fragaria_ui/components/ElasticAutocompletionSearch.tml
	src/main/resources/nc/isi/fragaria_ui/pages/PropertyEditBlocks.tml