From the Front Line #29
Merge branch 'master' into video

* master:
  From the Front Line #29

Conflicts:
	build/apple-touch-icon-114x114-precomposed.png
	build/apple-touch-icon-144x144-precomposed.png
	build/apple-touch-icon-57x57-precomposed.png
	build/apple-touch-icon-72x72-precomposed.png
	build/apple-touch-icon-precomposed.png
	build/apple-touch-icon.png
	build/blog/2013/03/building-with-grunt/index.html.gz
	build/blog/2013/03/codio-for-education/index.html.gz
	build/blog/2013/03/codio-is-live-and-kicking/index.html.gz
	build/blog/2013/03/collaboration-in-coding/index.html.gz
	build/blog/2013/03/index.html.gz
	build/blog/2013/03/our-twenty-percent-time/index.html.gz
	build/blog/2013/03/page/2/index.html.gz
	build/blog/2013/03/we-are-hiring-engineers/index.html.gz
	build/blog/2013/04/add-a-readme-file-to-your-project/index.html.gz
	build/blog/2013/04/annotations-released/index.html.gz
	build/blog/2013/04/coding-art-math/index.html.gz
	build/blog/2013/04/drag-and-drop-in-the-file-explorer/index.html.gz
	build/blog/2013/04/index.html.gz
	build/blog/2013/04/page/2/index.html.gz
	build/blog/2013/04/post-curriculum/index.html.gz
	build/blog/2013/04/say-it-with-a-sample/index.html.gz
	build/blog/2013/04/secure-previewing/index.html.gz
	build/blog/2013/04/sugata-mitra/index.html.gz
	build/blog/2013/05/emmet-support/index.html.gz
	build/blog/2013/05/index.html.gz
	build/blog/2013/05/inline-preview/index.html.gz
	build/blog/2013/05/mode-selection-and-ui-refresh/index.html.gz
	build/blog/2013/05/one-click-deployment/index.html.gz
	build/blog/2013/06/bug-fixed-in-50-minutes/index.html.gz
	build/blog/2013/06/coding-kids/index.html.gz
	build/blog/2013/06/colour-preview-and-picker/index.html.gz
	build/blog/2013/06/compiled-files/index.html.gz
	build/blog/2013/06/index.html.gz
	build/blog/2013/06/journey/index.html.gz
	build/blog/2013/06/moving-from-mercurial-to-git/index.html.gz
	build/blog/2013/06/page/2/index.html.gz
	build/blog/2013/06/real-time-coding/index.html.gz
	build/blog/2013/06/snippets/index.html.gz
	build/blog/2013/07/from-the-frontline-1/index.html.gz
	build/blog/2013/07/from-the-frontline-10/index.html.gz
	build/blog/2013/07/from-the-frontline-11/index.html.gz
	build/blog/2013/07/from-the-frontline-12/index.html.gz
	build/blog/2013/07/from-the-frontline-13/index.html.gz
	build/blog/2013/07/from-the-frontline-14/index.html.gz
	build/blog/2013/07/from-the-frontline-15/index.html.gz
	build/blog/2013/07/from-the-frontline-16/index.html.gz
	build/blog/2013/07/from-the-frontline-2/index.html.gz
	build/blog/2013/07/from-the-frontline-3/index.html.gz
	build/blog/2013/07/from-the-frontline-4/index.html.gz
	build/blog/2013/07/from-the-frontline-5/index.html.gz
	build/blog/2013/07/from-the-frontline-6/index.html.gz
	build/blog/2013/07/from-the-frontline-7/index.html.gz
	build/blog/2013/07/from-the-frontline-8/index.html.gz
	build/blog/2013/07/from-the-frontline-9/index.html.gz
	build/blog/2013/07/index.html.gz
	build/blog/2013/07/page/2/index.html.gz
	build/blog/2013/07/page/3/index.html.gz
	build/blog/2013/07/page/4/index.html.gz
	build/blog/2013/07/page/5/index.html.gz
	build/blog/2013/07/removing-apps/index.html.gz
	build/blog/2013/08/all-new-site/index.html.gz
	build/blog/2013/08/from-the-frontline-17/index.html.gz
	build/blog/2013/08/from-the-frontline-18/index.html.gz
	build/blog/2013/08/from-the-frontline-19/index.html.gz
	build/blog/2013/08/from-the-frontline-20/index.html.gz
	build/blog/2013/08/from-the-frontline-21/index.html.gz
	build/blog/2013/08/from-the-frontline-22/index.html.gz
	build/blog/2013/08/from-the-frontline-23/index.html.gz
	build/blog/2013/08/from-the-frontline-24/index.html.gz
	build/blog/2013/08/from-the-frontline-25/index.html.gz
	build/blog/2013/08/from-the-frontline-26/index.html.gz
	build/blog/2013/08/index.html.gz
	build/blog/2013/08/page/2/index.html.gz
	build/blog/2013/08/page/3/index.html.gz
	build/blog/2013/08/the-problem-with-promises/index.html.gz
	build/blog/2013/09/from-the-frontline-27/index.html.gz
	build/blog/2013/09/from-the-frontline-28/index.html.gz
	build/blog/2013/09/index.html.gz
	build/blog/2013/index.html.gz
	build/blog/all/index.html.gz
	build/blog/index.html.gz
	build/blog/page/10/index.html.gz
	build/blog/page/11/index.html.gz
	build/blog/page/12/index.html.gz
	build/blog/page/13/index.html.gz
	build/blog/page/14/index.html.gz
	build/blog/page/15/index.html.gz
	build/blog/page/2/index.html.gz
	build/blog/page/3/index.html.gz
	build/blog/page/4/index.html.gz
	build/blog/page/5/index.html.gz
	build/blog/page/6/index.html.gz
	build/blog/page/7/index.html.gz
	build/blog/page/8/index.html.gz
	build/blog/page/9/index.html.gz
	build/favicon.png