fixed bug with namespace for user and userentity

Change-Id: I1a368107355edf963ba625dea6e0a043b1fb8f57
Merge branch 'master' of https://github.com/mikemackintosh/Bakery.git
updated composer.json version

Change-Id: I0d95b19f7ff78c048526f43c709e197c11c176e0