2nd modification of index.html
Merge branch 'view' into dev

Conflicts:
	index.htm
QQ