PRD-4689: Clarify the build process for macs.
PRD-4692: Fix test case
Merge branch 'master' of github.com:pentaho/pentaho-reporting into PRD-4692

Conflicts:
	libraries/libformula-ui/test/org/pentaho/openformula/ui/FormulaEditorPanelTest.java
Merge pull request #228 from dkincade/master

PRD-4699 - Updated the build.xml to override the subfloor.xml way of setting the version number in the MANIFEST.MF
PRD-4702: DocSupport declared itself as toc-module and caused havoc on publish that way.
Merge pull request #229 from dkincade/master

ENGOPS-104 - Updated the license information for this release
PRD-4716: Changed build so that samples are added recursively to bundle.
Merge pull request #230 from wseyler/dev

PRD-4716: Changed build so that samples are added recursively to bundle.
PRD-4723: Datasource editor for query scripting still buggy
Merge branch 'master' into PRD-4723
Merge pull request #231 from dkincade/master

ENGOPS-104 - Updated the OS License html file
PRD-4725, CM-466: Apply workaround for ivy-publish bug
PRD-4725, CM-466: Apply workaround for ivy-publish bug - second try after the first one fell short.
PRD-4729 - Build fix for testcases project
Method BigDecimal#toString() returns logarithm representation of the number in some cases. Use toPlainString() instead.
[PPP-3081] license header updates on all .java, .js, and .jsp
Revert "[PPP-3081] license header updates on all .java, .js, and .jsp"

This reverts commit 6663e92c54089e4f0cbcdc6877f95be27b626c8d.
[PPP-3081] license header updates on all .java, .js, and .jsp
fix for licenese header script fail
PRD-4661: Borders on a band with children that have 100% height caused invalid layouts