Entity objects for decision maker
Merge branch 'master' of https://github.com/MusesProject/MusesClient.git
Merge remote-tracking branch 'origin/master'