Fix directory layout DIC id
Merge branch 'master' into master-dev

Conflicts:
	src/AngryBytes/GeneratorBundle/Resources/config/services.yml
Merge pull request #1 from ivarb/master-dev

Fix directory layout DIC id