abfbf
Merge branch 'OrGuz'

Conflicts:
	BrandisPortal/target/m2e-wtp/web-resources/META-INF/maven/il.co/brandis/pom.properties