changes
removing doctrine
Merge branch 'master' into develop