UI update
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	osslab/src/app/templates/third.html
Merge pull request #28 from czx0619/dev

UI update