organized the plugins code into include
Merge branch 'master' into feature/sharebutton