fixed bug with template path for themes.
Merge branch 'master' into gh-pages