mg purge
Merge branch 'master' of https://github.com/weijinweng/toffee-node

Conflicts:
	server/database.js