Display null values properly in list view
Merge branch 'LaurentVB-null-value-display' into 1.x

Conflicts:
	templates.js
Update templates.js