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

Conflicts:
	BrandisPortal/src/main/java/il/co/brandis/dao/UserDAO.java