测试session
Merge remote-tracking branch 'origin/master'

Conflicts:
	content/companyCard.html
	content/home.html
	content/login.html
	content/register.html
	js/config.js
	js/controllers/cardCtrl.js
	js/controllers/loginCtrl.js
	js/controllers/registerCtrl.js
	js/route.js