Merge pull request #3 from adaptlearning/develop

Develop
Updated tests folder
Merge branch 'master' of https://github.com/adaptlearning/adapt-contrib-blank

# By Kevin Corry
# Via Daryl Hedley (2) and Kevin Corry (1)
* 'master' of https://github.com/adaptlearning/adapt-contrib-blank:
  Updated filename within spec runner
  - Fix for issue #1 - New template format - Updated tests

Conflicts:
	karma.conf.js
Merge branch 'master' into develop

* master:
  Updated tests folder