[PLAT-6611] Resolved conflict
[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
[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
Merge pull request #122 from OpenGamma/topic/PLAT-6611

Topic/plat 6611