8/12/2014 mahder
cbccbcb
Merge remote-tracking branch 'origin/Mahder' into Ghenet

Conflicts:
	src/main/java/com/control/AccountContrl.java
	src/main/java/com/control/ProductControl.java
	src/main/webapp/login.xhtml
	target/classes/com/control/AccountContrl.class
	target/classes/com/control/ProductControl.class
	target/classes/com/control/ShoppingControl.class
	target/classes/login.xhtml

	target/m2e-wtp/web-resources/META-INF/maven/HibernateMavenized/HibernateMavenized/pom.properties