Merge branch 'refs/heads/develop' into topic/PLAT-6702
Adding smile model based DiscreateVolatilityFunctionProvider
Added test for ParameterizedSmileModelDiscreateVolatilityFunctionProvider
Merge branch 'refs/heads/topic/PLAT-6701' into topic/PLAT-6702

Conflicts:
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/model/volatility/discrete/ParameterizedSABRModelDiscreteVolatilityFunctionProvider.java
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/model/volatility/discrete/ParameterizedSmileModelDiscreateVolatilityFunctionProvider.java
Merge branch 'refs/heads/topic/PLAT-6701' into topic/PLAT-6702
Added null check to args
Merge remote branch 'refs/remotes/origin/develop' into topic/PLAT-6702
Added javadoc
Cleared up the logic in ParameterizedSmileModelDiscreateVolatilityFunctionProvider.from and added test for no points
Spelling
Removed commented out code and correct spelling
arg checks in concatenatedVectorFunction
Added test for full coverage of ParameterizedSmileModelDiscreteVolatilityFunctionProvider
remove redundant comments
Merge pull request #158 from OpenGamma/topic/PLAT-6702

Topic/plat 6702