Fixed entity table having duplicate indexes
Merge branch 'develop' into doctrine-test
Removed attribute table since it does not seem to be used anymore