refractory
Merge branch 'master' into developer

Conflicts:
	src/main/resources/global.properties
	src/main/webapp/WEB-INF/view/case/base_info.jsp
add special case view
Merge branch 'master' into developer

Conflicts:
	src/main/java/com/zstrength/builder/dao/impl/BuilderProjectDAOImpl.java
add builderProject's baseinfo , traffic function
Merge branch 'master' into developer

Conflicts:
	src/main/java/com/zstrength/builder/dao/BuilderProjectsDAO.java
	src/main/java/com/zstrength/builder/dao/impl/BuilderProjectDAOImpl.java
	src/main/java/com/zstrength/builder/service/ProjectService.java
	src/main/java/com/zstrength/builder/service/impl/ProjectServiceImpl.java