add grid markup and styles
Merge remote-tracking branch 'origin/develop' into frontend

Conflicts:
	public/index.html