Merge pull request #1 from Wiki616/dev

Dev
10.10 version for latest ui
demo for connect to api server successfully
the latest version on 10.10
Merge pull request #2 from Wiki616/dev

Dev
10.11 first version
freeze version before next Monday
Merge pull request #3 from Wiki616/dev

Dev
Delete \
add config files

add config files
Merge branch 'master' of https://github.com/Wiki616/LABOSS
Update index.html

update the url
Update base.html

update the url
Merge remote-tracking branch 'upstream/dev'

Conflicts:
	frontend/app/static/js/course.js
	frontend/app/templates/base.html
	frontend/app/templates/course.html
	frontend/app/templates/index.html
	frontend/app/templates/index1.html
	frontend/app/templates/login.html
	frontend/app/templates/windows.html
fix coding error
fix osslab
Delete linux.html
Delete paper2.html
Delete test.html
Delete test_ice.html