Commit feature
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/modules/custom/features/node_types/node_types.features.field_base.inc
	sites/all/modules/custom/features/node_types/node_types.features.field_instance.inc
	sites/all/modules/custom/features/node_types/node_types.info
Updated features to 2.x branch