[PLT-352] Added dep including AsciiTable api
[PLAT-6611] Resolved conflict
[PLT-352] Updated convention to use regionId rather than a calendar object directly.
[PLT-352] Updated httpcomponent versions for use of JRE system property configured http connections.
Merge pull request #118 from OpenGamma/topic/PLT-352

Updates to pom.xml and domain objects for credit
[REQS-366] Improved documentation for cure calibration tests.
[PLAT-6611] Resolved conflict
[PLAT-6611] Added ATM caps
Merge branch 'topic/PLAT-6611' of github.com:OpenGamma/OG-Platform into topic/PLAT-6611

Conflicts:
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/interestrate/capletstripping/CapletStrippingDirect2D.java
	projects/OG-Analytics/src/test/java/com/opengamma/analytics/financial/interestrate/capletstripping/CapletStrippingDirect2DTest.java
[PLT-367] Updated MarketDataSnapshotSource to extend from Source<NamedSnapshot> rather than Source<StructuredMarketDataSnapshot>
[PLT-368] Added handling for deserializing to SortedMaps.
Merge pull request #119 from OpenGamma/topic/PLT-367

Updated MarketDataSnapshotSource to extend from Source<NamedSnapshot>
Merge pull request #120 from OpenGamma/topic/PLT-368

[PLT-368] Added handling for deserializing to SortedMaps.
[PLT-352] Changed to use region id
Update release notes
[PLAT-6611] Resolved conflict
[PLAT-6611] Added ATM caps
[PLAT-6611] Tidy up codes, add unit tests
Merge branch 'topic/PLAT-6611' of github.com:OpenGamma/OG-Platform into topic/PLAT-6611

Conflicts:
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/interestrate/capletstripping/CapletStrippingDirect2D.java
	projects/OG-Analytics/src/test/java/com/opengamma/analytics/financial/interestrate/capletstripping/CapletStrippingDirect2DTest.java
[PLAT-6611] Delete duplicated files