Create Templates and Modules for stores
Merge branch 'master' into openshift