Merge pull request #1 from slideep/master

Updated package.json configuration, added express's views-folder and vie...
Merge remote-tracking branch 'upstream/master'
Added e2e configuration.