Updated composer.json versions
Merge branch 'master' of source.jcid.nl:jcid/framework2