clean code
Merge branch 'master' into develop

Conflicts:
	src/main/webapp/WEB-INF/view/bargain/buyer_contract_confirmation.jsp
Merge branch 'master' into develop

Conflicts:
	src/main/webapp/WEB-INF/view/bargain/buyer_contract_confirmation.jsp
refactory :buyer'bargain  and add seller's list view
Merge branch 'master' into develop

Conflicts:
	src/main/resources/spring/applicationContext.xml