footer fix and started hackathon skip the setting page
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	osslab/src/app/views.py
lab-122 is ok
resolve the comments
resolve the comments
Merge pull request #50 from czx0619/dev

looks good now
update port assignment logic
Merge remote-tracking branch 'opentech/master'
update style of project readme
Merge pull request #52 from juniwang/master

update README and change the port assignment logic
notRegister page css update, head update  and setting page css fix
fix and enhance fullscreen view of guacamole clients
Merge pull request #51 from XiaoxiongZheng/master

update register information api
Merge remote-tracking branch 'opentech/master'
handle some edge case for registration to make it more robust
Merge pull request #54 from juniwang/master

fix guacamole full screen issue
页面文字及图片修改
Merge pull request #53 from czx0619/dev

notRegister page css update, head update  and setting page css fix
try to fix login expire time
fix focus issue of guacamole