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
show count rightly
Merge pull request #62 from juniwang/master

show count rightly
全屏位置和底部位置修改
Merge pull request #64 from czx0619/dev

全屏位置和底部位置修改
Merge pull request #65 from XiaoxiongZheng/master

rails and mean templates
 fix email issue
Merge remote-tracking branch 'opentech/master'
docker template for ubuntu
Merge pull request #66 from juniwang/master

add template for ubuntu