version under testing with joe -> admin
Merge branch 'master' into BISERVER-8427

Conflicts:
	extensions/test-src/org/pentaho/platform/plugin/services/metadata/MetadataRepositoryLifecycleManagerTest.java
	extensions/test-src/org/pentaho/test/platform/security/userroledao/jackrabbit/UserRoleDaoTest.java
	extensions/test-src/org/pentaho/test/platform/web/http/api/FileResourceTest.java
	extensions/test-src/org/pentaho/test/platform/web/http/api/RepositoryResourceTest.java
	repository/test-src/org/pentaho/platform/repository2/unified/webservices/jaxws/UnifiedRepositoryToWebServiceAdapterTest.java
	repository/test-src/org/pentaho/test/platform/repository2/mt/RepositoryTenantManagerTest.java
	repository/test-src/org/pentaho/test/platform/security/userroledao/UserRoleDaoUserDetailsServiceTest.java
	repository/test-src/org/pentaho/test/platform/security/userroledao/UserRoleDaoUserRoleListServiceTest.java

Admin user added and joe removed.
Roles updated
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427

Conflicts:
	extensions/test-src/org/pentaho/platform/plugin/services/metadata/MetadataRepositoryLifecycleManagerTest.java

Reverted changed roles to better testing with datasources
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427

Reverted initial roles for testing
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427
[BISERVER-8446] Expose new JCR methods in IUnifiedRepository
[BISERVER-8446] Minor cleanup
BISERVER-8532 - PUC content tab widths are slightly too big for the visible area
Merge pull request #111 from rfellows/dev

BISERVER-8532 - PUC content tab widths are slightly too big for the visi...
Merge pull request #110 from bytekast/BISERVER-8446

[BISERVER-8446] Expose new JCR methods in IUnifiedRepository
BISERVER-8540 Error when Creating New Schedule - "cronExpression cannot
be null" 
BISERVER-8542 Report Properties window gives Server Error...Error Code:
404
Changed the DefaultBlockoutManager to use the same scheduler that
QuartzScheduler is using.
BIServer 8408 - toggle workspace and browser menu item - hide toolbar
for scheduler workspace
Merge pull request #113 from wseyler/master

Change the DefaultBlockoutManager to use the same underlying Scheduler that the
Merge pull request #112 from pentaho-tband/master

BI Server 8408 Fix toggle menu item browser/workspace - disable toolbar in scheduler workspace
BISERVER-7898 - IE9 Unable to login qa-platforms.petnaho.com:7080 default security settings

Added require.js and require-cfg.js to the spring security FilterSecurityInterceptor whitelist in applicationContext-spring-security.xml.
BISERVER-8551 - creating a quartz job implementation that will prevent execution of an ActionAdapterQuartzJob when it is executed during a blockout period.
Merge pull request #114 from jeffreythomas/dev

BISERVER-7898 - IE9 Unable to login qa-platforms.petnaho.com:7080 defaul...
Merge pull request #115 from kurtwalker/master

BlockingQuartzJob