add buyer'sbargaining agressment
Merge branch 'master' of https://github.com/chiuyinche/SnailHouses

Conflicts:
	src/main/java/com/zstrength/builder/Controller/BuilderSpecialCaseController.java
Merge branch 'develop'
update release.xml