Remove the html content template on mkfile action - could be eventually replaced by a generic templating mechanism
Merge remote-tracking branch 'origin/develop' into develop