Remodelled scorers and filters
Second Remodelling of scorers and filters.
Integrated Free text search in discovery engine module;
Changed input format of discovery engine to json
Implemented REST interface for advanced discovery
Added model references to output of discovery REST API
Merged from master branch
Improved performances of popularity scorers
Decoupled free text search implementation from discovery API module
Renamed free text search implementation module
Synchronized with master branch
Merge branch 'discovery-ranking' into master-github

Conflicts:
	iserve-discovery-rest/pom.xml
	iserve-discovery-rest/src/main/java/uk/ac/open/kmi/iserve/discovery/engine/rest/DiscoveryEngineResource.java
	iserve-discovery-rest/src/main/java/uk/ac/open/kmi/iserve/discovery/engine/rest/DiscoveryRestModule.java
	iserve-discovery-rest/src/main/java/uk/ac/open/kmi/iserve/discovery/engine/rest/DiscoveryResultsBuilder.java
	iserve-free-text-search/src/main/java/uk/ac/open/kmi/iserve/discovery/freetextsearch/FreeTextSearchPlugin.java
	iserve-free-text-search/src/main/java/uk/ac/open/kmi/iserve/discovery/freetextsearch/impl/OwlimSearchPlugin.java
	iserve-free-text-search/src/test/java/uk/ac/open/kmi/iserve/discovery/freetextsearch/test/FreeTextSearchTest.java
	iserve-popularity-scoring/src/main/java/uk/ac/open/kmi/iserve/discovery/ranking/impl/CommunityVitalityScorer.java
	iserve-popularity-scoring/src/main/java/uk/ac/open/kmi/iserve/discovery/ranking/impl/PopularityScorer.java
	iserve-popularity-scoring/src/main/java/uk/ac/open/kmi/iserve/discovery/ranking/impl/ProviderPopularityScorer.java
	iserve-popularity-scoring/src/main/java/uk/ac/open/kmi/iserve/discovery/ranking/impl/UsageScorer.java
	iserve-popularity-scoring/src/test/java/uk/ac/open/kmi/iserve/discovery/ranking/test/PopularityBasedRankingTest.java
	iserve-sal-core/src/main/java/uk/ac/open/kmi/iserve/sal/manager/impl/NfpManagerSparql.java
	iserve-sal-core/src/main/java/uk/ac/open/kmi/iserve/sal/manager/impl/ServiceManagerSparql.java
	pom.xml
Bug fixes after merge