添加users route
Implement API version1.0
Merge branch 'master' of github.com:HellMagic/matrix
fix utils conflict
Conflicts:
	lib/utils.js