Updated features to the 2.x branch
Updated ctools version in the make file
Updated feature with latest version of features module (features 2)
Exported with features 2 and language as english
Added ctools patch to fix filter_xss_admin call
Merge branch 'release' of github.com:ding2tal/ding_campaign into release
Added Features_extra to make file, so it's possible to add menu_blocks etc. to features
Merge remote-tracking branch 'origin' into release
Merge branch 'release' into development
Merge branch 'development' into merge

Conflicts:
	ding_campaign.make
	modules/ding_campaign_ctype/ding_campaign_ctype.features.field.inc
	modules/ding_campaign_ctype/ding_campaign_ctype.info