Merge branch 'master' of https://github.com/laichendong/talent into laichendong-master

Conflicts:
	app/views/admin/addSubject.jade
	app/views/admin/editSubject.jade
	templates/default/detail.jade