Fixed #13: Added web service, integrated with snippets
Merge Fulltext webservice for snippet retrieval  branch 'David/FullText'
clunky concept eval added
Merge branches 'master' and 'spalakod/evaluator'
Eval null triplets
Merge branch 'master' into Amos/triple-evaluation

Conflicts:
	project-team02/src/main/java/team2/Evaluator.java
Merge branch 'Amos/triple-evaluation'
Fixing Eval error
Fixed error in MAP calculation
Adapted to use abstract
Merge branch 'Yulong/ExpendingSnippets' of
github.com:11791-2/team-project2 into Yulong/ExpendingSnippets

Conflicts:
	project-team02/src/main/java/team2/SnippetsRetrieval.java