[PLAT-5023] added ability to dump regression report to console as well as files; file and console dump can be enabled by system props (Julian)
[PLAT-5750] regenerated joda beans to fix build
[PLAT-5751] : In TimeCalculator class add a function getTimeBetween using a calendar as input
[PLAT-5742] ; use the daycounter business/252 in the toderive function for the files CouponFixedAccruedCompoundingDefinition, SwaptionPhysicalFixedCompoundedONCompoundedDefinition and SwaptionCashFixedCompoundedONCompoundedDefinition.
[PLAT-5755] Displaying a single accrual year fraction per row
[PLAT-5747] Fixed initial rates on annuity schedule
[PLAT-5763] Fixed IborIndex construction missing index name
[PLAT-5765] Ignore signed notionals when constructing annuities
[PLAT-5766] Added check for null compound method
[PLAT-3900] update database schema scripts as part of new UserMaster implementation

Conflicts:
	projects/OG-Bloomberg/OG-Bloomberg.iml
	projects/OG-BloombergExample/OG-BloombergExample.iml
	projects/OG-Client/OG-Client.iml
	projects/OG-Component/OG-Component.iml
	projects/OG-Engine/OG-Engine.iml
	projects/OG-Examples/OG-Examples.iml
	projects/OG-Financial/OG-Financial.iml
	projects/OG-Integration/OG-Integration.iml
	projects/OG-Language/OG-Language.iml
	projects/OG-LiveData/OG-LiveData.iml
	projects/OG-MasterDB/OG-MasterDB.iml
	projects/OG-MavenPlugin/OG-MavenPlugin.iml
	projects/OG-Parent/pom.xml
	projects/OG-Provider/OG-Provider.iml
	projects/OG-Security/OG-Security.iml
	projects/OG-Server/OG-Server.iml
	projects/OG-Util/OG-Util.iml
	projects/OG-UtilDB/OG-UtilDB.iml
	projects/OG-UtilDB/pom.xml
	projects/OG-Web/OG-Web.iml
[PLAT-3900] implemented UserMaster and RoleMaster and corresponding DB counterparties

Conflicts:
	projects/OG-Core/src/main/java/com/opengamma/core/user/impl/SimpleOGUser.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/ManageableOGUser.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/UserDocument.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/UserSearchRequest.java
	projects/OG-MasterDB/src/main/java/com/opengamma/masterdb/user/DbUserMaster.java
	projects/OG-MasterDB/src/test/java/com/opengamma/masterdb/user/DbUserMasterTest.java
[PLAT-3909] Module signing and verifying capabilities

Conflicts:
	build.xml
	pom.xml
Update release notes
[PLAT-3913] Remote UserMaster

Conflicts:
	projects/OG-Master/src/main/java/com/opengamma/master/user/impl/DataUserMasterResource.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/impl/DataUserResource.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/impl/RemoteUserMaster.java
[PLAT-3888] Create Framework for testing RESTful resources

Conflicts:
	projects/OG-Analytics/OG-Analytics.iml
	projects/OG-Bloomberg/OG-Bloomberg.iml
	projects/OG-BloombergExample/OG-BloombergExample.iml
	projects/OG-Client/OG-Client.iml
	projects/OG-Component/OG-Component.iml
	projects/OG-Core/OG-Core.iml
	projects/OG-Engine/OG-Engine.iml
	projects/OG-Examples/OG-Examples.iml
	projects/OG-Financial/OG-Financial.iml
	projects/OG-Integration/OG-Integration.iml
	projects/OG-Language/OG-Language.iml
	projects/OG-LiveData/OG-LiveData.iml
	projects/OG-Master/OG-Master.iml
	projects/OG-MasterDB/OG-MasterDB.iml
	projects/OG-Maths/OG-Maths.iml
	projects/OG-MavenPlugin/OG-MavenPlugin.iml
	projects/OG-Provider/OG-Provider.iml
	projects/OG-Security/OG-Security.iml
	projects/OG-Server/OG-Server.iml
	projects/OG-Util/OG-Util.iml
	projects/OG-Util/pom.xml
	projects/OG-UtilDB/OG-UtilDB.iml
	projects/OG-Web/OG-Web.iml
[PLAT-4578] Flexible binomial tree model
[PLAT-5759] Truncation of binomial tree
[PLAT-2260] format change
[PLAT-5762] Compute the lowest asset price in OptionFunctionProvider
[PLAT-5771] Fixed initial rate on ZC floating leg
[PLAT-5772] Type can't be omitted, but can default to Object.class (Stephen)