Updates on models and fixtures
Fixes on models and updated the fixture for current sprint
Merge branch 'master' of github.com:elmpp/EntityBundle