features
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/modules/features/library_features_content_type_files/library_features_content_type_files.features.field.inc
	sites/all/modules/features/library_features_content_type_files/library_features_content_type_files.info