Maj doc
Merge branch 'master' of https://github.com/Soletic/OxygenFrameworkBundle

Conflicts:
	Resources/doc/entity_override_manager.rst