Merge branch 'master' into attribute_ranking_enhancement
added tests for scoredAttribute, and fixed a few bugs
Merge branch 'tmp-master' into attribute_ranking_enhancement
Fixed a few bugs