fixing container ids
adding console
Merge branch 'master' into master-dev

Conflicts:
	src/AngryBytes/GeneratorBundle/Resources/config/services.yml