GAE version
Merge branch 'master' of https://github.com/qiantianpei/MyNUS

Conflicts:
	templates/index.html
map implemented
attribute allocation page improved