Moved diagrams a bit
Merge branch 'master' of https://github.com/cholewa1992/contextframework