Update to markup and menu
Merge pull request #14 from ndynan-gp/ndynan

Update to markup and menu
Merge branch 'master' into ndynan
Changed scroller to allow desktop events
Merge pull request #16 from ndynan-gp/ndynan

Ndynan
Fixed Conflicts