error page
Testing
First Comments
cart comments and logger
general controller
Merge branch 'bend'

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