增加信用卡測試網頁
Merge branch 'master' into develop

Conflicts:
	.classpath
Bugfix
POJO UPDATE:
1.擴充活動表格
2.增加活動相關表
先開啟可以上傳中小圖功能
feature:add 活動種類
Merge branch 'master' into develop
Merge branch 'develop' into feature/house_setting
Add Trigger For Obj_house status changed
1.Add new POJO FOR CREDIT CARD FESTURE;
2.CHANGE SOME ORIGINAL TABLE
3.Bugfix FOR data column type or length change
Change Bargain records setting for employeeId
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
Bugfix:for change schema
Version1 : add new design html
Merge branch 'master' into develop
Merge branch 'develop' into feature/house_setting

Conflicts:
	src/main/java/com/zstrength/bargain/controller/BargainBuyerController.java
Feature:更新優惠代碼驗證方式
Feature:加上信用卡驗證畫面
Merge branch 'feature/house_setting' into develop