Merge branch 'nickholub-webdemos'
Merge remote-tracking branch 'upstream/master' into webdemos
#85 Web Demos - Architecture Documentation