[PLAT-2881] - Merge changes from branch topic/PLAT-2959 to ensure database scripts are in line
[PLAT-2881] - Add in new table for sec_equity_index_futureoption. Migrate from sec type EQUITY_INDEX_FUTURE_OPTION to EQUITY_INDEX_DIVIDEND_FUTURE_OPTION for table sec_equity_index_dividend_futureoption
[PLAT-2881] - Add in new hibernate mapping for sec_equity_index_futureoption. Sec type EQUITY_INDEX_FUTURE_OPTION_TEMP replaced with EQUITY_INDEX_FUTURE_OPTION
[PLAT-2881] - Add in web display of EquityIndexFutureOptionSecurity and EquityIndexDividendFutureOptionSecurity
Merge branch 'topic/PLAT-2959' into topic/PLAT-2881
[PLAT-2881] - Added load tests for EquityIndexFutureOption and EquityIndexDividendFutureOption
[PLAT-2881] - Add in Excel conversions for EquityIndexFutureOptionSecurity and EquityIndexDividendFutureOptionSecurity
[PLAT-2881] - Fixed typo
[PLAT-2881] - Added loader for EquityIndexFutureOptions. Amended resolver code to distiguish EquityIndexFutureOptions and EquityIndexDividendFutureOptions
[PLAT-2881] - Added EquityIndexDividendFutureOptionSecurityLoader
Merge branch 'develop' of github.com:OpenGamma/OG-Platform into topic/PLAT-2881
Merge branch 'develop' of github.com:OpenGamma/OG-Platform into topic/PLAT-2881
[PLAT-2881] - Update margin resolve behaviour
[PLAT-2975] - Add FXFutureOptionSecurity: added database tables
[PLAT-2975] - Add FXFutureOptionSecurity: added hibernate mapping and loader tests
[PLAT-2977] Added a separate class for equity options
Java 7 compliance
Removing checkstyle warnings
[PLAT-2976], [PLAT-2980] Adding PDE pricing for equity options. Stopping getRequirements() throwing an exception for mark-to-market futures pricing
[PLAT-2976], [PLAT-2980] Adding PDE pricing for equity options. Stopping getRequirements() throwing an exception for mark-to-market futures pricing