test commit
mahder Latest
mahder merge

Conflicts:
	target/classes/.gitignore
last commit
8/11/2014   9:02PM Mahder
Merge remote-tracking branch 'origin/Mahder' into Ghenet

Conflicts:
	src/main/java/com/control/AccountContrl.java
	src/main/java/com/control/ShoppingControl.java
	target/classes/.gitignore
	target/classes/com/control/AccountContrl.class
	target/classes/com/control/ShoppingControl.class
	target/classes/com/dao/AccountDAO.class
	target/classes/messages/properties/messages.properties

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