Template overriding is now supported
Merge branch 'master' into 0.0.x-dev
Fixed issue with initTheme
Merge branch 'master' into 0.0.x-dev