version2.6 student pages
Merge branch 'master' of https://github.com/qgang/ITEnglish

Conflicts:
	code/makeiteasy/WebRoot/pages/StuPages/login.html