Revert "fix"

This reverts commit 34c08a91e8d563d30498bb0a41682bf010bc20c2.
Revert "Revert "fix""

This reverts commit 129a45613a47926f36902a2a0765528002e863dc.
Merge branch 'master' of https://github.com/yezhiming/BusinessMate

Conflicts:
	config/router.js