MH-10013 — Added ACL manager and security patch
MH-10013 — Fixed logging and joda time
MH-10013 — Fixed dataloader
Merge branch 'develop' into f/MH-10013-security-acl

Conflicts:
	modules/matterhorn-conductor/src/main/java/org/opencastproject/event/handler/WorkflowPermissionsUpdatedEventHandler.java
MH-10013 -- Comment userReferenceProvider in default security xml
MH-10013 -- More work on ACL patch
MH-10013 -- Fixed Java 1.7 compiler issues
Merge branch 'develop' into f/MH-10013-security-acl

Conflicts:
	modules/matterhorn-common/pom.xml
	modules/matterhorn-common/src/main/java/org/opencastproject/fn/Fns.java
	modules/matterhorn-common/src/main/java/org/opencastproject/fn/juc/Immutables.java
	modules/matterhorn-common/src/main/java/org/opencastproject/fn/juc/Iterables.java
	modules/matterhorn-common/src/main/java/org/opencastproject/fn/juc/Lists.java
	modules/matterhorn-common/src/main/java/org/opencastproject/fn/juc/Mutables.java
	modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Misc.java
	modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Options.java
MH-8550 Added Configuration Manger UI to edit Matterhorn properties and XML files in the browser
MH-8550 Bugfixes for the Workflow editor. And now the Workflow editor uses the same endpoint as the Config Editor to load the files.
MH-10013 — Fix problem with new ACL episode schedule that cannot be saved.
MH-10013 — Fix bug in the series UI when edition ACL. The false value were not written in the ACL document.
Merge branch 'develop' into f/MH-10013-security-acl

Conflicts:
	modules/matterhorn-common/pom.xml
	modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageParser.java
MH-10013 — Fix bug with missing workflow parameters for episode and series ACL transitions. The parameters were missing if the user did not open the configuration window.
MH-10013 — Fix bug with missing privileges information in “View Series Info” page if only one privilege has been defined.
MH-10013 — Fix bug resulting to “not able to save the transition” when changing the ACL on a transition with workflow.
MH-10013 — Fix little constancy issues.
Merge branch 'develop' into f/MH-10013-security-acl

Conflicts:
	modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Strings.java
	modules/matterhorn-textextractor-ocropus/src/main/java/org/opencastproject/textextractor/ocropus/OcropusTextExtractor.java
	pom.xml
MH-8550 fixed access rights to the configuration manager
MH-8550 now poperties input field is much longer