Merge branch 'master' of https://github.com/Tazmaniack/FirstSymfony2App.git