Merge pull request #45 from juniwang/dev

modify a little on login logic to fit coding style
Merge pull request #46 from juniwang/master

fix several issues
Merge remote-tracking branch 'upstream/dev' into dev
add logout
Merge pull request #48 from czx0619/dev

Dev
Merge pull request #49 from juniwang/master

upgrade docker template
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'