Merge pull request #1 from Wiki616/master

frontend
Merge pull request #7 from Wiki616/dev

Dev
remove unexpected folder
Merge pull request #12 from juniwang/master

remove unexpected folder
Merge remote-tracking branch 'upstream/master' into dev
add justify user; move database.py; modify config.py
mask password
delete config.py~ database.py~
test ssh
move database.py modify justify_user.py
Merge pull request #36 from juniwang/dev

add more database models
remove osslab/__init__.py
Merge remote-tracking branch 'opentech/dev' into testlog
fixed logHandler
Merge pull request #37 from SpAiNiOr/testlog

Log module issue fixed
update hackathon iframe url and add a radio
Merge remote-tracking branch 'upstream/dev' into dev
add table register modify justify_user.py and templates.py
Merge pull request #35 from XiaoxiongZheng/dev

Dev
11