[*] Small changes and comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/html-template/index.html
	client/html-template/index.template.html
[*] Small changes and comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	video-comment-recorder/html-template/index.html