Merge pull request #65 from alex-deaconu/master

[fix] Fixed build, cleanup, updated scroll plugin
[fix] Updated e2e tests