case 2359 - Notices fix.
Merge branch 'case-2359' into develop
Merge remote-tracking branch 'origin/develop'
Release: v1.9.6
Merge branch 'master' into develop
Review @ Coding Standards.
Merge remote-tracking branch 'ding2tal/development' into ding2tal
case 1770. Addition of translation function og interest period into both alma and openrouth.
case 2604 - Workaround for 1.1 version.
Merge branch 'case-2604' into develop
Merge remote-tracking branch 'origin/ding2tal' into develop
Merge remote-tracking branch 'origin/develop'
Release: v1.11
Added Features_extra to make file, so it's possible to add menu_blocks etc. to features
Added make file to resolve conflict
Moved inc files into includes
Exported the feature as version 2.x of features
Added hook_populate_pseudo_entity() to replace hook_replace_entity()
Renamed field_reservation_pause to field_openruth_reservation_pause
Renamed openruth_preferred_branch to field_openruth_preferred_branch