lol
Merge branch 'master' of https://github.com/matYang/badstudentfrontend

Conflicts:
	scripts/view/locationPickView.js