test5ben
Merge branch 'master' of https://github.com/bend0303/BrandisPortal.git
into bend

Conflicts:
	BrandisPortal/src/main/java/il/co/brandis/dao/UserDAO.java
Merge remote-tracking branch 'origin/master' into Or

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