Refactoring

Conflicts:

	Resources/config/config.yml
Merge branch 'master' of git://github.com/c2is/BigfootCoreBundle

Conflicts:
	Resources/config/config.yml