moved code to set templates to Controller->loadTemplate() from Controller->__construct()
Merge remote-tracking branch 'origin/develop' into dev/nahakiole