Merge branch 'master' of https://github.com/lei40251/MyPro

Conflicts:
	temp/js/pages.js
Merge remote-tracking branch 'origin/master'