Merge pull request #1 from dlinknctu/dev

Dev
Spacing fixed
Spacing
Spacing and mistyped Type
Fixed Indents
Fixed Indents
Fixed Indent
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	webui/index.html
Merge pull request #69 from ChickenFood/dev

Fix several indent problem and typo.