new Design
Merge branch 'master' into new_design

Conflicts:
	index.html
fix branch