Merge pull request #52 from tkafalas/master

Fix NPE on import junit testing
UI change requests by Brett.
Merge branch 'master' of https://github.com/pentaho/pentaho-platform.git
BISERVER-8300 Improve the transitions from step to step within the
Scheduling dialog
Fixing mangled properties (dangling string on wrong prop line)
ANALYZER-1815 Schedule an Analyzer/PRPT Report - Excel and CSV output
types are not saved in correct file formats.
BISERVER-8217 - Fixing pentahoObjects.xml
Merge pull request #53 from pminutillo/master

BISERVER-8217 - Fixing pentahoObjects.spring.xml for CE
BISERVER-8299 Update the email options within the schedule dialog
8192 - fix spelling typo
Merge pull request #54 from pentaho-tband/dev-local-tmb

BIServer 8192 - fix spelling typo
BISERVER-8170 - Fixing tests related to import
BISERVER-8144 - moved composite key creation for roles and tenant to jcr
BISERVER-7280 Updated get jobs to check if an user is Admin or not. Moved canSchedule to SchedulerResource
Merge pull request #57 from rmansoor/master

BISERVER-8144 - moved composite key creation for roles and tenant to jcr
BISERVER-8144 - updating the userRoleDao bean
Merge pull request #58 from rmansoor/master

 BISERVER-8144 - updating the userRoleDao bean
BISERVER-8144 - Fixed unit test
Merge pull request #59 from rmansoor/master

 BISERVER-8144 - Fixed unit test
Merge pull request #55 from pminutillo/master

BISERVER-8170 - Fixing tests related to import