test from ben
Merge branch 'master' of https://github.com/bend0303/BrandisPortal.git
user change from ben
Merge branch 'master' of https://github.com/bend0303/BrandisPortal.git

Conflicts:
	BrandisPortal/src/main/java/il/co/brandis/entities/User.java
test
Merge branch 'master' into OrGuz

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