Draft of the custom entity
Merge branch 'master' into feature/custom_entity

Conflicts:
	cookbook/map.rst.inc
changed typo in Doctrine
Creating a custom entity with management screen
Typo and cleanup
Merge branch 'feature/custom_entity'

Conflicts:
	cookbook/map.rst.inc