up:
Merge branch 'engineyard' of github.com:yandod/phpmentors-training-example-symfony into engineyard