Action Based Security story for Scheduling Activities complete
Update assembly/package-res/install-doc/Installing_Pentaho_Community_Edition_In_Jboss.html

updating the text
BISERVER-7891 As Pentaho we need to move the user preference backend
into the JCR
Merge branch 'master' of https://github.com/pentaho/pentaho-platform.git
Merge pull request #24 from e-cuellar/master

Unit test fixes.
Unit test fix.
Merge branch 'master' of https://github.com/pentaho/pentaho-platform.git
Massive PUC cleanup:
removing compiler warnings
moving to new api calls for deprecations
adding license headers where missing
updating license headers where incorrect (eg MPL)
removing unused classes
Merge branch 'master' of https://github.com/pentaho/pentaho-platform.git
BISERVER-8130 Scheduler Email option appears even though email server is
not setup
Import cleanup
PentahoMetadataDomainRepositoryTest fix.
Merge remote-tracking branch 'origin/master'
Fixes for unit tests
Merge branch 'master' of https://github.com/pentaho/pentaho-platform.git
BIServer8155 - modified import ACL parameters for interface and import
handler - needed to modify both command line and import dialog
changes made after testing command line
Merge branch 'master' of https://github.com/pentaho/pentaho-platform
BISERVER-8130 Scheduler Email option appears even though email server is
not setup
Merge pull request #25 from pentaho-tband/master

BIServer 8155 - Modified the import bundle to handle new attributes