Forward port #61

* mockiemockiz-hotfix/dupicate-content-ajax-module-patch:
  Fixes #58 fixed duplicate content
Merge branch 'master' into develop
Forward port #64
Merge branch 'master' into develop Forward port #68
apply doctrine dependencies
short array syntax
patch close parenthesis
Merge pull request #67 from samsonasik/feature/doctrine-dependencies

apply doctrine dependencies