db changed, add caOrder
Merge branch 'master' of https://github.com/LiSheep/sam_wechat

Conflicts:
	wechat/db.js
start shell