Merging 'templates' into 'develop'

Hopefully this works! GitHubs interface is SO confusing! Why can't we just use BitBucket? It is SO much better and more user friendly!