Merge remote-tracking branch 'upstream/master' into dev
UI update
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	osslab/src/app/static/js/commonRight.js
	osslab/src/app/static/js/hackathon.js
	osslab/src/app/templates/commonRight.html
	osslab/src/app/templates/hackathon.html
	osslab/src/app/templates/settings.html
fix return index href
Merge pull request #61 from czx0619/dev

Dev