change name from htm to html
Modified
Again
Merge branch 'view' into dev

Conflicts:
	index.htm
QQ