Merge pull request #4 from vise890/integration-tests

Integration tests
Merge pull request #5 from vise890/fix-js-includes

fix the duplicated application.js include