update bargain logic
update bargain's comfirm_completion,confirm_traction
add check  bargain's end time
add bargain for seller model
Merge branch 'master' into develop

Conflicts:
	src/main/webapp/resources/apptheme/js/jquery-1.10.2.min.js
Merge branch 'develop' into feature/real_esss
bugfix & refctory