引导  和 修复
Merge branch 'master' of https://github.com/leifeng/ember_gongjiao

Conflicts:
	app.html