Merge remote-tracking branch 'upstream/master'

Conflicts:
	os2web_meetings.views_default.inc
Merge branch 'hotfix/views-caching'
Merge remote-tracking branch 'origin/hotfix/change-labels'
Add patch to autocomplete_deluxe. Ref: https://drupal.org/node/1754164

"Always truncate the first 2 and last 2 character when adding new terms"
Merge pull request #1 from andersbryrup/hotfix-1.0.3

Add patch to autocomplete_deluxe. Ref: https://drupal.org/node/1754164
Add implementation of os2web_subscription when meetings are updated to "Referat"
Merge branch 'master' of github.com:syddjurs/os2web_meetings into develop
Merge branch 'hotfix-1.0.3' into develop