Build & server
Merge branch 'develop' into much-contribute-wow

Conflicts:
	examples/grid-layouts.html