Merge branch '2.3' of https://github.com/elmpp/symfony-rest-edition

Conflicts:
	README.md
moved the BaseBundle to EntityBundle
Merge branch 'master' of https://github.com/elmpp/EntityBundle