Spring Form
Log4j configuration
Merge branch 'master' of https://github.com/bend0303/BrandisPortal.git
Merge branch 'master' into bend

Conflicts:
	BrandisPortal/src/main/java/il/co/brandis/controller/CartController.java
	BrandisPortal/target/classes/il/co/brandis/controller/CartController.class