Merge branch 'master' into attribute_ranking_enhancement
added tests for scoredAttribute, and fixed a few bugs
explanation
explanation progress bars added
rework ranking explanation
Merge branch 'tmp-master' into attribute_ranking_enhancement
Fixed a few bugs
Merge remote-tracking branch 'origin/tmp-master' into ranking_explanation_asutcl
Refactoring of explanations
fixed code error due to mahtod signature change in tests
fixed rank explanation view
Merge branch 'tmp-master' of https://github.com/prmr/Creco.git into tmp-master
Merge remote-tracking branch 'origin/tmp-master' into
ranking_explanation_asutcl

Conflicts:
	src/main/java/ca/mcgill/cs/creco/logic/ConcreteServiceFacade.java
removec debugging and logged errors
Sorting Fix
rank exp.
Merge remote-tracking branch 'origin/tmp-master' into ranking_explanation_asutcl
rank explanation
features test
Merge remote-tracking branch 'origin/tmp-master' into
ranking_explanation_asutcl and added correlation sort as default #79

Conflicts:
	src/main/webapp/js/features_form.js