Cleanup code samples for controller section
Merge branch 'master' into gh-pages
Update build