design
Merge branch 'master' into design

Conflicts:
	footer.html
Merge branch 'design'