Updated with future feature page.
Merge branch 'gh-pages' of github.com:edge226/ghmd-cms into gh-pages