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