properties with null value not shown
Merge branch 'master' of github.com:neontribe/gbptm-ui

Conflicts:
	config.js
	server.js