Merge pull request #402 from jorgesilva/develop

Fixes several architectural issues and inconsistencies
Merge pull request #405 from jorgesilva/develop

Minor fixes for issues resulting from recent architectural overhaul
Merge pull request #407 from jorgesilva/develop

Changed show order for highlighter and HUD. Fixes #406
Merge pull request #409 from jorgesilva/develop

Package refactoring and removal of unnecessary ListPreference duplicate
Move all sources from framework into add-on package