some shanges
Merge branch 'master' of https://github.com/briia-glib/EStore

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.briia/EStore/pom.properties