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
fix bargain's bug and update register flower ui
bug fix : buyer's endTime and seller's endTime
add enterprise's pojo andd tune register ,footer layout
Merge branch 'developer'
Merge branch 'master' into develop