Merge pull request #346 from anilgooru/dev-branch

Bug fixes.
Scroll enabled disabled in preview and resource play.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: