Merge branch 'LongRiver' of http://192.168.0.141/hx into LongRiver

Conflicts:
	package.json
	system_modules/database/dbconfig.js