lalaMerge branch 'master' of github.com:gonzaparra/webankyrins

Conflicts:
	vendor/doctrine/doctrine-fixtures-bundle/Doctrine/Bundle/FixturesBundle