Creating template
Fixing merge conflicts
Fixing deploy scripting permissions