Template Creation major update
Merge branch 'master' of https://github.com/redatomstudios/GAO
Minor change in Create Template