Adding resources
Merge remote-tracking branch 'origin/master'

Conflicts:
	baseproject/src/Ya/DataCollectorBundle/DependencyInjection/YaDataCollectorExtension.php