Merge pull request #215 from wseyler/dev

Updated TriggerProxy so that JSON can define the Trigger type that is cr...
BISERVER-8103: Wrap blockStatus in trigger JSON
Merge pull request #216 from pentaho-skarmali/biserver-8103_ui_for_blockout_periods

BISERVER-8103
BISERVER-8297 As an admin I want the ability to cleanse the repository
of scheduled content older than a specified period of time
BISERVER-8426, BISERVER-7561, BISERVER-7858 LDAP Configuration - map the system | admin role to an LDAP group and related fixes
Merge pull request #217 from pminutillo/master

BISERVER-8426, BISERVER-7561, BISERVER-7858 LDAP Configuration
Update repository.spring.xml

Removing the merge <<<
BISERVER-8436 - Updated another repository.spring.xml with new properties
Merge pull request #219 from pminutillo/master

BISERVER-8436 - Adding properties to repository.spring.xml
BISERVER-8436 - Updated another repository.spring.xml with new properties

BISERVER-8436 - LDAP group and user mapping - Prepopulate admin group and user with defaults
Merge pull request #220 from pminutillo/master

BISERVER-8436 - LDAP group and user mapping - Prepopulate admin group and user with defaults
BISERVER8103: Updated POST query for adding a recurrence period.  Still not working though
fixed merge issues
merge issues
Merge pull request #221 from pentaho-skarmali/biserver-8103_ui_for_blockout_periods

Biserver 8103 ui for blockout periods
BISERVER-8578 - localizing and other cleanup
BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser
Merge pull request #223 from jeffreythomas/dev

BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser
add a getter/setter for duration in JsJobTrigger.  Removed JsBlock and use JsJobTrigger instead
removed jsblock as we are using jsjobtrigger