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
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427

Commit under testing for pull upstream master
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427
Tests updated
Merge pull request #133 from pminutillo/master

BISERVER-8443 Add hide metadata property to file and folders.
BISERVER-8532 - PUC content tab widths are slightly too big for the visible area -- Fixed issue with resizing of the solution browser (splitter dragging) in IE where the content panel wouldn't resize properly when moving it too fast.
[BIServer 8408] refactor how show navigator works at startup, code
cleanup
Merge pull request #134 from rfellows/dev

BISERVER-8532 - PUC content tab widths are slightly too big for the visi...
Merge pull request #135 from pentaho-tband/dev

[BIServer 8408] refactor how show navigator works at startup, code
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427

Updated test cases files
BISERVER-7071 Tomcat won't shut down
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427

Commit ready for pull request
Recovered idea files
Recovered idea files
Recovered idea file