fixed login bug
fixed bug
finish seminar
Merge branch 'master' into 0724

Conflicts:
	app.js
finish init
Merge branch '0724'