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

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

fix several issues
Merge pull request #48 from czx0619/dev

Dev
upgrade docker template
Merge pull request #49 from juniwang/master

upgrade docker template
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	osslab/src/app/views.py