bulid project
Merge branch 'master' of https://github.com/sjordancr/cl_bt_system
Merge branch 'master' of https://github.com/sjordancr/cl_bt_system
update
Merge branch 'master' of https://github.com/sjordancr/cl_bt_system

Conflicts:
	sql.txt
Merge branch 'master' of https://github.com/sjordancr/cl_bt_system

Conflicts:
	WebRoot/WEB-INF/web.xml
	WebRoot/error.jsp
	WebRoot/index.jsp
	src/com/good/modules/base/action/BaseAction.java
	src/jdbc.properties
	src/struts.xml
update