Merge pull request #88 from apache/merge-feature-pages

Merge features and features-overview pages