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
adding user permissions
Merge remote-tracking branch 'origin' into release
Added ding_campaing dependency to sub-feature
Fixed undefined property warning during installation profile execution
Merge branch 'master' into release
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release
Resolved merge conflict in campaign.inc
Fixed merge conflict in main module
Resolved merge conflict in feature fields
Resolved merge conflict in edit access callback
Resolved merge conflict in sub-module info file
case 2416 - Fixed campaign rule settings.
Resolved merge conflict in fields
case 2416 - Added new rule types.
case 2416 - Fixed coding style.
case 2416 - Fixed library rule.