fix + improve
Switch template engine for Ejs

(INPROGRESS...)
Switch template engine for Ejs

(INPROGRESS...)
Merge remote-tracking branch 'origin/develop'