Fixed a bug with templates not loading
Merge branch 'development'