Two bugs on HTML display
Merge branch 'master' of github.com:NoodleEducation/dataman into cleanup