Fix gitignore stuff
Merge branch 'master' of https://github.com/rune92/symfony_dont_touch
Fix entity relationships