Action Based Security story for Scheduling Activities complete
Merge branch 'master' of https://github.com/webdetails/pentaho-platform

Conflicts:
	api/src/org/pentaho/platform/api/email/IEmailService.java
	extensions/src/org/pentaho/platform/web/http/api/resources/SchedulerResource.java
	user-console/source/org/pentaho/mantle/client/workspace/WorkspacePanel.java
Merge branch 'master' of https://github.com/webdetails/pentaho-platform
Changed build config
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into ABS-Scheduling
Updated SchedulerResource with new Policy for getting jobs
Merge pull request #39 from tkafalas/master

Vary Import Log Columns based on log level
Merge pull request #37 from webdetails/ABS-Scheduling

Abs scheduling
BISERVER-8174 - Allow lower level logging in Import Log.  Make
IRepositoryImportLog extend Log for compatibility with existing logging.