Added Features_extra to make file, so it's possible to add menu_blocks etc. to features
Merge branch 'release' into development
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
Removed long date format and added it to ding_base
Merge branch 'development' of github.com:ding2tal/ding_page into development
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 newest version of menu_block from git with patch to make block exportable and reexported the feature
Added newest version of menu_block from git with patch to make block exportable and reexported the feature - part II
Added secondary menu to the feature
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
Changed ting reference widget type