add 格局圖
Merge branch 'master' into gallery

Conflicts:
	src/main/java/com/zstrength/obj/dao/impl/ObjPhotoDaoImpl.java
	src/main/resources/bankTxnLog.properties
Merge branch 'master' of github.com:chiuyinche/SnailHouses

Conflicts:
	src/main/resources/bankTxnLog.properties
Merge branch 'master' into develop

Conflicts:
	.classpath