2.3

also includes https://github.com/gimler/symfony-rest-edition/pull/4
should be merged into a new branch called 2.3