templates not needed anymore
fix loading problem - that will lead to not logging in successfully etc.
Merge branch 'master' into gh-pages
fix loading bug merge