Merge branch 'BenyamNew' into MergeBenyIntoJean

Conflicts:

target/MavenOnlineBusiness-1.0-SNAPSHOT/WEB-INF/classes/shop/dao/IAddres
sDao.class
remove old