Added HTMLGenerator Interface
Merge remote-tracking branch 'origin/develop' into dev/nahakiole