project details
moved complex templates to html
htmlmin
Merge branch 'dev'

Conflicts:
	index.html