Flat UI
Merge branch 'master' into gh-pages

Conflicts:
	_includes/head.html
Overrides for github pages