always fetch the template list
Merge branch 'master' into features/always_fetch_template_list
Merge branch 'master' into bluebox-production-org