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