Plugin Fix?
Merge pull request #7 from lring/develop

Plugin Fix?
Merge branch 'develop' of https://github.com/always-on/always into develop
Fix pluginContainer's
Update disco
Disco 1.6.10
solving merge conflicts