update
Merge branch 'master' of https://github.com/stoute/domain_features

Conflicts:
	domain_features.features.field_base.inc
	domain_features.features.field_instance.inc
	domain_features.features.inc
	domain_features.features.user_permission.inc
	domain_features.info
	domain_features.services.inc