commit huoshi-backstage
Merge branch 'master' of http://github.com/EricleeCrystal/huoshi-backstage

Conflicts:
	.gitignore