created show notes for frozen videos
Only display city if we know it.
Made code.org header less tall.
Merge pull request #572 from code-dot-org/staging

DTT
Implement primitive functional cond blocks.
Merge pull request #575 from code-dot-org/test

DTP
touch up functional_cond
Automatically built.

commit ae17a2d314c7026eae8341cb82780a20f5872abc
Merge: 81d1390 66416ce
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Wed Nov 26 15:30:54 2014 -0800

    Merge pull request #559 from code-dot-org/webapp_console_errors_and_math

    webapp console.log, math, and error handling in user program

commit 81d13904d0a3a739756e0f7a87db655bfbccd4db
Merge: eff6acf dd8b507
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 26 15:23:06 2014 -0800

    Merge pull request #573 from code-dot-org/levelbuilder

    level builder changes
Merge pull request #576 from code-dot-org/levelbuilder

level builder changes
Merge pull request #574 from code-dot-org/functional_cond

Implement primitive functional cond blocks.
Dropbox and Gsheet changes
delete case-change-duplicate .level file
Added Code Studio logo.
Made studio.code.org header less tall.
add codeintl keys to all locales
Automatically built.

commit 21ef0fc267fa19090eae8cfdabe0d27ef46f7efc
Merge: f92c918 b65ea36
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Wed Nov 26 16:18:17 2014 -0800

    Merge pull request #574 from code-dot-org/functional_cond

    Implement primitive functional cond blocks.

commit f92c918aa7472b799398581e639c80c056127caf
Merge: c570d45 31ec61f
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 26 16:16:03 2014 -0800

    Merge pull request #576 from code-dot-org/levelbuilder

    level builder changes

commit 31ec61f91719808a625aae9f915e34c2908b8603
Author: Continuous Integration <dev@code.org>
Date:   Thu Nov 27 00:15:39 2014 +0000

    level builder changes

commit c570d452363ccd6e247f3b01d04576844f65c764
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 26 23:54:15 2014 +0000

    Automatically built.

    commit ae17a2d314c7026eae8341cb82780a20f5872abc
    Merge: 81d1390 66416ce
    Author: davidsbailey <davidsbailey@users.noreply.github.com>
    Date:   Wed Nov 26 15:30:54 2014 -0800

        Merge pull request #559 from code-dot-org/webapp_console_errors_and_math

        webapp console.log, math, and error handling in user program

    commit 81d13904d0a3a739756e0f7a87db655bfbccd4db
    Merge: eff6acf dd8b507
    Author: Tanya Parker <tanyacparker@gmail.com>
    Date:   Wed Nov 26 15:23:06 2014 -0800

        Merge pull request #573 from code-dot-org/levelbuilder

        level builder changes

commit b65ea3617c17fee49679af6598806815874e8474
Author: David Bailey <dsb123@gmail.com>
Date:   Wed Nov 26 15:51:51 2014 -0800

    touch up functional_cond
Merge pull request #577 from code-dot-org/staging

DTT
remove supplementary codeintl tags from es,pt
generic routes for /api
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging