migrated to Lambdava
engine functions dsl
fixed comment
Organisation Master
added additional in-memory component factories
added GregorianCalendar to ZonedDateTime converter
Merge branch 'develop' into topic/engine_functions_dsl

Conflicts:
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/equity/EquityDerivativeSensitivityCalculator.java
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/equity/variance/pricing/VarianceSwapStaticReplication.java
	projects/OG-Bloomberg/src/main/java/com/opengamma/bbg/BloombergCurrencyRateFunction.java
	projects/OG-BloombergExample/src/main/java/com/opengamma/bloombergexample/loader/CurveNodeHistoricalDataLoader.java
	projects/OG-BloombergExample/src/main/java/com/opengamma/bloombergexample/loader/DemoEquityOptionCollarPortfolioLoader.java
	projects/OG-BloombergExample/src/main/java/com/opengamma/bloombergexample/loader/ExampleEquityPortfolioLoader.java
	projects/OG-Core/src/main/java/com/opengamma/core/AbstractEHCachingSource.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/depgraph/ResolutionState.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/fudgemsg/ViewDefinitionFudgeBuilder.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/function/CompiledFunctionService.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/function/DummyFunctionReinitializer.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/function/FunctionReinitializer.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/function/MarketDataSourcingFunction.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/function/resolver/DefaultCompiledFunctionResolver.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/view/calcnode/SimpleCalculationNode.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/view/compilation/ViewDefinitionCompiler.java
	projects/OG-Engine/src/main/java/com/opengamma/engine/view/helper/AvailablePortfolioOutputs.java
	projects/OG-Engine/src/test/java/com/opengamma/engine/view/cache/WriteBehindViewComputationCacheTest.java
	projects/OG-Financial/src/main/java/com/opengamma/batch/domain/RiskRun.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/ircurve/YieldCurveFunctionHelper.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/cds/ISDAApproxCDSPriceFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/equity/indexoption/EquityIndexOptionDefaults.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/equity/indexoption/EquityIndexOptionFundingCurveSensitivitiesFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/forex/forward/FXForwardPV01Function.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/forex/forward/FXForwardYCNSFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/forex/option/callspreadblack/FXDigitalCallSpreadBlackPV01Function.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/futureoption/FutureOptionBlackDefaultPropertiesFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/volatility/cube/SABRNonLinearSwaptionVolatilityCubeFittingFunctionNew.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/timeseries/AbstractHistoricalTimeSeriesShiftFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/volatility/cube/VolatilityCubeFunctionHelper.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/volatility/surface/EquityOptionVolatilitySurfaceDataFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/volatility/surface/RawVolatilitySurfaceDataFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/currency/CurrencyCrossRateFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/currency/PnlSeriesCurrencyConversionFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/generator/SecurityGenerator.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/marketdatasnapshot/StructuredSnapper.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/view/ConfigDbOverrideWatchSetProvider.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/view/ViewProcessorManager.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/view/WatchSetProvider.java
	projects/OG-Financial/src/test/java/com/opengamma/financial/view/ViewProcessorManagerTest.java
	projects/OG-Integration/src/main/java/com/opengamma/integration/tool/marketdata/CurveHtsResolverTool.java
	projects/OG-Master/src/main/java/com/opengamma/master/config/impl/MasterConfigSource.java
	projects/OG-MasterDB/src/test/java/com/opengamma/masterdb/batch/ViewClientTest.java
	projects/OG-Util/src/main/java/com/opengamma/util/functional/Functional.java
	projects/OG-Util/src/main/java/com/opengamma/util/map/HashMap2.java
	projects/OG-Util/src/main/java/com/opengamma/util/tuple/IntObjectPair.java
	projects/OG-Util/src/main/java/com/opengamma/util/tuple/LongObjectPair.java
	projects/OG-Util/src/main/java/com/opengamma/util/tuple/ObjectsPair.java
	projects/OG-Util/src/main/java/com/opengamma/util/tuple/Pair.java
	projects/OG-Util/src/test/java/com/opengamma/util/ArgumentCheckerTest.java
	projects/OG-Util/src/test/java/com/opengamma/util/tuple/PairFudgeEncodingTest.java
	projects/OG-Web/src/main/java/com/opengamma/web/analytics/PortfolioGridStructure.java
Merge remote-tracking branch 'origin/develop' into engine_functions_dsl
fixing merge
added missing Lambdava project
moved sorces to location compatible with maven
initial warning for unsaved changes in view definitions
hashchange handling moved to og.views.configs
initial suppress hashchange custom event handling
removed events once executed
Merge branch 'ui/dev' into ui/topic/unsaved-viewdefs
Merge branch 'ui/dev' into ui/topic/unsaved-viewdefs
saving changes disables hashchange. pending changes prevents form reload
liberating hashchange
Merge branch 'ui/dev' into ui/topic/unsaved-viewdefs