modified to adjust hao's computer
Merge branch 'master' of https://github.com/ludwiksh/Marksimos

Conflicts:
	app.js
	common/config.js