from the front line #12
Merge remote-tracking branch 'origin/master' into 15_swifttype_search

Conflicts:
	build/404/index.html.gz
	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-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/removing-apps/index.html.gz
	build/blog/2013/index.html.gz
	build/blog/all/index.html.gz
	build/blog/feed.xml
	build/blog/index.html.gz
	build/blog/page/10/index.html
	build/blog/page/10/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
	build/blog/page/9/index.html.gz
	build/css/lib/btn-8b8d312e.css.gz
	build/css/lib/rainbow/github-164a4cfa.css.gz
	build/css/lib/rainbow/linecount-9a1155c4.css.gz
	build/css/normalize-85b355e1.css.gz
	build/docs/account-needed/index.html.gz
	build/docs/account-settings/editor/index.html.gz
	build/docs/account-settings/index.html.gz
	build/docs/account-settings/password/index.html.gz
	build/docs/account-settings/profile/index.html.gz
	build/docs/account-settings/teams/index.html.gz
	build/docs/annotations/adding-annotation/index.html.gz
	build/docs/annotations/annotations-file/index.html.gz
	build/docs/annotations/auto-start/index.html.gz
	build/docs/annotations/collapsing/index.html.gz
	build/docs/annotations/embedding/index.html.gz
	build/docs/annotations/example-project/index.html.gz
	build/docs/annotations/helpers/index.html.gz
	build/docs/annotations/index.html.gz
	build/docs/annotations/md-overview/index.html.gz
	build/docs/annotations/own-ide/index.html.gz
	build/docs/annotations/readme-md/index.html.gz
	build/docs/annotations/tour-explore/index.html.gz
	build/docs/annotations/video-overview/index.html.gz
	build/docs/annotations/videos/index.html.gz
	build/docs/annotations/why/index.html.gz
	build/docs/annotations/widget/index.html.gz
	build/docs/anon/create/index.html.gz
	build/docs/anon/editing/index.html.gz
	build/docs/anon/forking/index.html.gz
	build/docs/anon/index.html.gz
	build/docs/anon/running/index.html.gz
	build/docs/anon/saving/index.html.gz
	build/docs/anon/viewing/index.html.gz
	build/docs/bower/accessing/index.html.gz
	build/docs/bower/consuming/index.html.gz
	build/docs/bower/finding/index.html.gz
	build/docs/bower/index.html.gz
	build/docs/bower/more-bower/index.html.gz
	build/docs/bower/remove/index.html.gz
	build/docs/bower/updating/index.html.gz
	build/docs/bugs/index.html.gz
	build/docs/compiling/index.html.gz
	build/docs/compiling/one-file/index.html.gz
	build/docs/compiling/other/index.html.gz
	build/docs/compiling/overview/index.html.gz
	build/docs/console/accessing-others/index.html.gz
	build/docs/console/accessing/index.html.gz
	build/docs/console/creating/index.html.gz
	build/docs/console/index.html.gz
	build/docs/console/project-description/index.html.gz
	build/docs/deployment/create/index.html.gz
	build/docs/deployment/deploy/index.html.gz
	build/docs/deployment/history/index.html.gz
	build/docs/deployment/index.html.gz
	build/docs/deployment/type-codio/index.html.gz
	build/docs/deployment/type-ftp/index.html.gz
	build/docs/deployment/type-nj/index.html
	build/docs/deployment/type-nj/index.html.gz
	build/docs/deployment/type-parse/index.html.gz
	build/docs/deployment/type-sftp/index.html.gz
	build/docs/ide/code-editor/color-preview/index.html.gz
	build/docs/ide/code-editor/editor-settings/index.html.gz
	build/docs/ide/code-editor/ide-beautify/index.html
	build/docs/ide/code-editor/ide-beautify/index.html.gz
	build/docs/ide/code-editor/ide-fold/index.html.gz
	build/docs/ide/code-editor/ide-force-lang/index.html.gz
	build/docs/ide/code-editor/ide-gutter/index.html.gz
	build/docs/ide/code-editor/ide-highlight-active/index.html.gz
	build/docs/ide/code-editor/ide-indent-guides/index.html.gz
	build/docs/ide/code-editor/ide-invisibles/index.html.gz
	build/docs/ide/code-editor/ide-theme/index.html.gz
	build/docs/ide/code-editor/ide-wrap/index.html.gz
	build/docs/ide/code-editor/index.html.gz
	build/docs/ide/code-editor/kb-shortcuts/index.html.gz
	build/docs/ide/code-editor/search-replace/index.html.gz
	build/docs/ide/emmet/emmet-calc/index.html.gz
	build/docs/ide/emmet/emmet-comment/index.html.gz
	build/docs/ide/emmet/emmet-css/index.html.gz
	build/docs/ide/emmet/emmet-goto-edit-point/index.html.gz
	build/docs/ide/emmet/emmet-goto-pair/index.html.gz
	build/docs/ide/emmet/emmet-html/index.html.gz
	build/docs/ide/emmet/emmet-image-size/index.html.gz
	build/docs/ide/emmet/emmet-inc-dec/index.html.gz
	build/docs/ide/emmet/emmet-match-tag/index.html.gz
	build/docs/ide/emmet/emmet-merge/index.html.gz
	build/docs/ide/emmet/emmet-ref/index.html.gz
	build/docs/ide/emmet/emmet-remove/index.html.gz
	build/docs/ide/emmet/emmet-select/index.html.gz
	build/docs/ide/emmet/emmet-wrap/index.html.gz
	build/docs/ide/emmet/index.html.gz
	build/docs/ide/emmet/snippets/index.html.gz
	build/docs/ide/ide-general/add-app/index.html.gz
	build/docs/ide/ide-general/add-file/index.html.gz
	build/docs/ide/ide-general/add-folder/index.html.gz
	build/docs/ide/ide-general/delete-folder/index.html
	build/docs/ide/ide-general/delete-folder/index.html.gz
	build/docs/ide/ide-general/editing/index.html.gz
	build/docs/ide/ide-general/exiting/index.html.gz
	build/docs/ide/ide-general/export/index.html.gz
	build/docs/ide/ide-general/fork/index.html.gz
	build/docs/ide/ide-general/index.html.gz
	build/docs/ide/ide-general/inline-preview/index.html.gz
	build/docs/ide/ide-general/permissions/index.html.gz
	build/docs/ide/ide-general/project-menu/index.html.gz
	build/docs/ide/ide-general/readme-md/index.html.gz
	build/docs/ide/ide-general/real-time/index.html.gz
	build/docs/ide/ide-general/running/index.html.gz
	build/docs/ide/ide-general/saving/index.html.gz
	build/docs/ide/ide-general/settings/index.html.gz
	build/docs/ide/ide-general/upload/index.html.gz
	build/docs/ide/index.html.gz
	build/docs/index.html.gz
	build/docs/public-private/index.html.gz
	build/docs/salesforce/index.html.gz
	build/docs/salesforce/sf-account/index.html.gz
	build/docs/salesforce/sf-create/index.html.gz
	build/docs/salesforce/sf-ide/index.html.gz
	build/docs/salesforce/sf-logs/index.html.gz
	build/docs/salesforce/sf-pull/index.html.gz
	build/docs/salesforce/sf-push/index.html.gz
	build/docs/signup/index.html.gz
	build/js/doc_search/base-f445311c.js.gz
	build/js/doc_search/doc_search.json
	build/js/doc_search/tipuesearch-7ed41a2b.js.gz
	build/js/education-form-17caae1c.js.gz
	build/js/lib/cookie-3e7d5dcd.js.gz
	build/js/lib/fancybox.min-7948793b.js.gz
	build/js/lib/jquery-transit-6ded8a9b.js.gz
	build/js/lib/utilities-df2f8b27.js.gz
	build/js/vendor/jquery.min-33074654.js.gz
	build/js/vendor/protofluid.min-2ff1c5b1.js.gz
	build/js/vendor/rainbow-2b7edd35.js.gz
	build/js/vendor/rainbow/generic-6a91084e.js.gz
	build/js/vendor/rainbow/javascript-5e0c6c6e.js.gz
	build/js/vendor/rainbow/linecount-6adb6b45.js.gz
	build/js/vendor/scrollspy-ac843a4e.js.gz
	build/js/vendor/turbolinks-f1d22333.js.gz