Nightwatch testrunner, first application tests
Fix merge conflicts (velocity-html-reporter)