Added Features_extra to make file, so it's possible to add menu_blocks etc. to features
Merge branch 'development' of github.com:ding2tal/alma into development