Merging up from staging to development

Includes fixes for:

* /teach/ - including it in the nav, allowing easy switch on/off of it, style tweaks
* removing the annoying desktop.less file (and including it on all pages)
* removing the webtrends tracking code
* additions to the pages app that allows for pages to be nested