Merge branch 'master' into develop

* master:
  Adjusted inview to sit with backbone events
  Fixed merge conflict
  Updated component name prefix
Fix for tests
Test path update
Merge pull request #6 from adaptlearning/tests

Fix for tests
Fixed bug with completion
Merge pull request #7 from adaptlearning/develop

Develop