dev setting
refactory
bug fix: popup windows 無法計算價格
Merge branch 'master' of https://github.com/chiuyinche/SnailHouses
tune ui :popup window for object house
Merge branch 'master' into developer
add Feature:保證金- 銀行戶驗證流程
Merge branch 'master' into develop
Merge branch 'develop' into feature/house_setting

Conflicts:
	src/main/java/com/zstrength/cmn/service/CommonDataService.java
	src/main/java/com/zstrength/usr/pojo/UsrMembers.java
	src/main/resources/hbm/UsrMembers.hbm.xml