Removed indexes that would conflict with doctrine migrations when generating foreign keys
Merge branch 'develop' into doctrine-test