20140819-例行提交
工业旅游基本完工
Merge branch 'master' of https://github.com/TYD-QKJ/qkjebiz.git

Conflicts:
	src/sql-map-config.xml