Action Based Security story for Scheduling Activities complete
BISERVER-7255: Modified assembly.xml so you can change the tomcat version number by modifing major and minor version property values. Updated version number to use tomcat 6.0.36
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
BISERVER-8225, BISERVER-8226 - Move hardcoded strings in CommandLineProcessor to resource bundle, and iImplement fixes for issues reported by FindBugs
Merge pull request #30 from rpbouman/master

BISERVER-7255: use tomcat 6.0.36
BISERVER-8196 ACLs mapped incorrectly in PUC
added bin-eclipse to ignore list in scheduler.
Removing UserSettingService exceptions for unauthenticated users
Adding serialVersionUID to RepositoryFileStreamProvider because any
changes are breaking quartz and thus breaking the platform causing it
not to start
PPP-3005 IE8 memory leak port from 4.5
Removing warnings from ThemeServlet
Merge branch 'master' of https://github.com/pentaho/pentaho-platform.git
Merge pull request #33 from tkafalas/master

Fix for PUC ACL
Merge pull request #34 from pminutillo/master

BISERVER-8225, BISERVER-8226 - Move hardcoded strings in CommandLineProcessor to resource bundle, and iImplement fixes for issues reported by FindBugs
BISERVER-7470 - Added database properties to the database node.
Merge pull request #35 from wseyler/master

BI-7470: Added code to persist advanced DatabaseConnection properties
Fixing mail settings types for scheduling/email
BISERVER-8245 When Editing prpt report schedules - selections are
blanked out and invalid
BISERVER-8243 Schedules - not receiving email. Server is using default
port "25"
BISERVER-8241 IE9 - Caching problem. Log out/Log in as different user
will still show as previous user. New schedules won't appear in
Workspace
UI changes for BISERVER-8171
Update the UI code after the UX reviews
BISERVER-7470: Fixed problem with creating DatabaseConnection when all
properties aren't in the JCR
Merge pull request #36 from wseyler/master

BI-7470: Fixed problem creating a DatabaseConnection when all element weren't persisted in JCR
Changed build config
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into ABS-Scheduling