Show metadata
Merge remote-tracking branch 'origin/master' into gridUI

Conflicts:
	index.html
First attemp at updating Grid.