Added Features_extra to make file, so it's possible to add menu_blocks etc. to features
Merge branch 'release' into development
Updated wysiwyg buttons and settings
Merge remote-tracking branch 'origin' into release
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release
adding user permissions to include roles defined in ding_user_roles, for permissions across modules that cannot otherwise be assigned meaningfully to a feature
Merge remote-tracking branch 'origin' into release
Merge branch 'core-pr-3' into development
Updated make file to point to ding2tal
Changed makefile to use development branch
Added <br> tag to allowed tags
Merge branch 'master' into release
Updated makefile to point to development branch and ding2tal
Resolved merge conflict with release branch
Merge remote-tracking branch 'origin' into release
Moved libaray select box into ding_library
Moved libaray select box into ding_library part II
Removed un-used category menu (using taxonomy menu in ding_event and ding_news)
Merge remote-tracking branch 'origin' into release