hm: checkboxes and addbloc enhancements
hm: application html conflict resolved
hm: re application html fix