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
Merge remote-tracking branch 'opentech/master'
quick
Merge pull request #56 from juniwang/master

fix login issue, guacamole fullscreen issue
fix urls
Merge pull request #57 from juniwang/master

fix urls
fix 134
Merge pull request #58 from juniwang/master

fix https://osslab.atlassian.net/browse/LAB-134
update readme
Merge pull request #59 from juniwang/master

update readme
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