Merge branch 'master' of github.com:Terradue/TepQWArch

Signed-off-by: Emmanuel Mathot <emmanuel.mahot@gmail.com>

Conflicts:
	pom.xml
Merge branch 'master' of github.com:Terradue/TepQWArch

Signed-off-by: Emmanuel Mathot <emmanuel.mahot@gmail.com>

Conflicts:
	pom.xml