Merge branch 'hotfix/1.0b4.1' into develop
Merge branch 'hotfix/1.0b4.2' into develop
Merge branch 'hotfix/1.0b4.3' into develop
change to use doctrine inflector
Merge branch 'develop'