conflict well fixed
Adapt Recommender System to recommend any type of resource.
Merge branch 'master' of https://github.com/ging/vish
fix merge