Merge pull request #52 from wardi/master

put primary content block first in HTML
wet datatable: don't print "None" in empty cells