Merge pull request #209 from rmansoor/master

BISERVER-8585 - Update label for inherit permissions
BISERVER-8637 - Updated extraRoles variable
BISERVER-8578 - activating some buttons.  fixing code indent
Merge pull request #210 from webdetails/BISERVER-8637

BISERVER-8637 - Updated extraRoles variable
Merge pull request #211 from kurtwalker/master

BISERVER-8578 - activating some buttons. fixing code indent
BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser
Merge pull request #212 from jeffreythomas/dev

BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser
PDI-9432: Fixed grant- the JCR Oracle user needs to create triggers.
BISERVER-8501 Scheduling recurrence message for "Every weekday" is
incorrect
BISERVER-8502 Scheduling recurrance message for "Every X day(s)" is
incorrect
BISERVER-8103: Make blockstatus accept POST instead of GET
Merge pull request #214 from pentaho-skarmali/biserver-8103_ui_for_blockout_periods

BISERVER-8103:
Merge pull request #213 from sflatley/master

PDI-9432- Granting "create trigger" to the Oracle JCR user.
Updated TriggerProxy so that JSON can define the Trigger type that is created with an "@Class" tag
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 <<<