all changes
changes for conditon values
changes for fomr
changes for Merchant Admin
Merge branch 'master' of
https://github.com/chandra512/popularityScore.git

Conflicts:
	popularityScore/src/main/java/de/rakuten/popularityScore/entities/condition/PopularityScoreConditionValuesEntity.java
	popularityScore/src/main/java/de/rakuten/popularityScore/services/calculation/MerchantScoreCalculator.java
	popularityScore/src/main/java/de/rakuten/popularityScore/services/calculation/merchantScore/MerchantComplainRateScore.java
	popularityScore/src/main/java/de/rakuten/popularityScore/services/calculation/merchantScore/MerchantContractCancellationScore.java
	popularityScore/src/main/java/de/rakuten/popularityScore/services/calculation/merchantScore/MerchantCustomerReviewScore.java
	popularityScore/src/main/java/de/rakuten/popularityScore/services/calculation/merchantScore/MerchantEroticScore.java
	popularityScore/src/main/java/de/rakuten/popularityScore/services/calculation/merchantScore/MerchantProductCancellationScore.java
	popularityScore/src/main/java/de/rakuten/popularityScore/services/calculation/merchantScore/MerchantRevenueComparableScore.java
	popularityScore/src/main/java/de/rakuten/popularityScore/services/calculation/merchantScore/MerchantRevenueScore.java
	popularityScore/src/main/java/de/rakuten/popularityScore/services/calculation/merchantScore/admin/MerchantScoreConditionsAdmin.java