Merge pull request #83 from daniellemayne/develop

Develop: upgraded to 2014.07 and also a templates bugfix