Removed Demos
Updated Content
Merge branch 'master' into gh-pages