fix oauth login
add test for omniauth login
remove boilerplate test comment
Merge pull request #805 from code-dot-org/require-type-for-users

Fix oauth login regression; add test so it is less likely to reregress
Merge pull request #807 from code-dot-org/finished

DTD
Automatically built: commit f2ee5c671602274329e8804a2f617c5fc01012ef
Merge: 3f04656 647f3f0
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 13:00:28 2014 -0700

    Merge pull request #668 from code-dot-org/studio_block_alignment

    [finishes #70782706] add arrangeStartBlocks()

commit 647f3f03c18ce22f9357d13a25af5e39b684f503
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 12:54:05 2014 -0700

    [finishes #70782706] add arrangeStartBlocks()
Merge pull request #808 from code-dot-org/finished

DTD: Automatically built: commit f2ee5c671602274329e8804a2f617c5fc01012ef
Automatically built: commit f2ee5c671602274329e8804a2f617c5fc01012ef
Merge: 3f04656 647f3f0
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 13:00:28 2014 -0700

    Merge pull request #668 from code-dot-org/studio_block_alignment

    [finishes #70782706] add arrangeStartBlocks()

commit 647f3f03c18ce22f9357d13a25af5e39b684f503
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 12:54:05 2014 -0700

    [finishes #70782706] add arrangeStartBlocks()
Merge pull request #809 from code-dot-org/finished

Deploy to delivered
Automatically built: commit a4aabaa442a34c42fa9208e248bebcf7753ea283
Merge: 3ec2020 ae6cf8c
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 15:11:43 2014 -0700

    Merge pull request #669 from code-dot-org/studio_more_sprites

    add art for 5 new sprites, improve handling of large numbers of sprites, fix wait for click

commit ae6cf8cc7902010caf86b156b747ac9b414b6cd2
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 15:05:14 2014 -0700

    add art for 5 new sprites, improve handling of large numbers of sprites, fix wait for click
Merge branch 'finished' into delivered
Automatically built: commit ef9961474beb944212a68fd8d18fbc23b27e23b1
Merge: a4aabaa f10ee2e
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Jun 12 15:26:12 2014 -0700

    Merge pull request #667 from code-dot-org/more_flappy_k1_blocks

    More flappy k1 blocks

commit a4aabaa442a34c42fa9208e248bebcf7753ea283
Merge: 3ec2020 ae6cf8c
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 15:11:43 2014 -0700

    Merge pull request #669 from code-dot-org/studio_more_sprites

    add art for 5 new sprites, improve handling of large numbers of sprites, fix wait for click

commit ae6cf8cc7902010caf86b156b747ac9b414b6cd2
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 15:05:14 2014 -0700

    add art for 5 new sprites, improve handling of large numbers of sprites, fix wait for click

commit f10ee2e88683ee6f7562acf1cf496544cf7932cc
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Jun 12 14:44:11 2014 -0700

    Add missing image

commit 3ec202050678636e28797846f3249e5eccfe7e6a
Author: deploy-code-org <dev@code.org>
Date:   Thu Jun 12 21:18:20 2014 +0000

    Imported from blockly-core
expose new bee blocks in level builder
Automatically built: commit e7e438b1008829b17a3b3e0e361577ded8282718
Merge: ef99614 006793e
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 16:08:05 2014 -0700

    Merge pull request #670 from code-dot-org/studio_bug_fixes

    [finishes #70480106]: fix saySprite and tickCount reset bugs

commit 006793e69f3cdbd664a6d8eed9cf9c0b7e1465a7
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 16:01:53 2014 -0700

    [finishes #70480106]: fix saySprite and tickCount reset bugs
Merge pull request #811 from code-dot-org/finished

DTD
Automatically built: commit 04c7d1a2b8fd6331b24d8edb9f946fa8cb6a9857
Merge: e7e438b 8275767
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Thu Jun 12 16:27:39 2014 -0700

    Merge pull request #671 from code-dot-org/beeConditional

    Bee conditional

commit 82757678da0fd2617386f7664ad6f53f6d1299c1
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jun 12 16:27:21 2014 -0700

    code review feedback and different color for while blocks

commit c4f986c0d79eeb15e5ce980083c90012caa4622e
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Jun 12 16:13:42 2014 -0700

    add while block

commit e7e438b1008829b17a3b3e0e361577ded8282718
Merge: ef99614 006793e
Author: cpirich <chris@code.org>
Date:   Thu Jun 12 16:08:05 2014 -0700

    Merge pull request #670 from code-dot-org/studio_bug_fixes

    [finishes #70480106]: fix saySprite and tickCount reset bugs
Merge pull request #810 from code-dot-org/newBeeBlocks

expose new bee blocks in level builder
Merge pull request #812 from code-dot-org/finished

deploy to delivered
Add notes on testing
Merge pull request #813 from code-dot-org/finished

Deploy to delivered (README only)