Adds javadoc for feeds
consistent javadoc usage of @code
deprecate unused AbstractCombiningEnricher
Merge pull request #466 from aledsage/fix/adds-javadoc-for-feeds

Adds javadoc for feeds