Revert ca4b237..a440bff

This rolls back to commit ca4b2376e998ab2b90e61d6c9afe02ea55704494.
Revert "Revert ca4b237..a440bff"

This reverts commit cce97787b0c625d01b51bba438210a8cb0964b0e.
Fixes Sis.CheckboxView missing
Fixes conclict with Master in subtask.hbs