Cookies addition
Merge branch 'bend'

Conflicts:
	BrandisPortal/src/main/java/il/co/brandis/services/UserManagerService.java