Moved demo services
Namespace controllers
Completed namespacing controllers
Namespace services
Fix paths
Disable esc
Merge branch 'refs/heads/master' into gh-pages
Build