Added geocomplete search for workshops map.
Added report page for workshops.
Merge branch 'workshops' into staging
play lab sharing string changes
new logo with no alpha channel
new logo with no alpha channel
fix show_image so it can use asset_url properly
Change to use local_file filename path so we save using original extension (rather than .fetch) on S3
Merge pull request #7 from code-dot-org/change_s3_save_filename

Change to use local_file filename path so we save using original extension (rather than .fetch) on S3
employee engagement: unauthorized -> not_authorized
Merge pull request #8 from code-dot-org/hoc-ee-fixauth

employee engagement: unauthorized -> not_authorized
Merge pull request #6 from code-dot-org/sharing_fixes

Sharing fixes, Logo fix for add to home screen
Allow session cookies through to [create|edit]_company_profile
Automatically built.

commit c0138ffd5c3c664684f75b746f44e6354c191f2d
Merge: 9207f45 065dabf
Author: cpirich <chris@code.org>
Date:   Mon Sep 22 14:30:03 2014 -0700

    Merge pull request #6 from code-dot-org/sharing_fixes

    Sharing fixes, Logo fix for add to home screen

commit 9207f455acf1a29e958cf03e0ffbdd50b4945433
Merge: c6ecd39 1ce54d5
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Mon Sep 22 14:15:33 2014 -0700

    Merge pull request #8 from code-dot-org/hoc-ee-fixauth

    employee engagement: unauthorized -> not_authorized

commit 1ce54d5efce94253ba879466aded1c056363b1f0
Author: David Bailey <dsb123@gmail.com>
Date:   Mon Sep 22 14:13:51 2014 -0700

    employee engagement: unauthorized -> not_authorized

commit c6ecd39cf15717a28e234fe8cb20918613036f23
Merge: a14c9f5 cc30b67
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Mon Sep 22 14:12:09 2014 -0700

    Merge pull request #7 from code-dot-org/change_s3_save_filename

    Change to use local_file filename path so we save using original extension (rather than .fetch) on S3

commit cc30b67f2157d37332bc8e335c8c7c129388d91a
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Mon Sep 22 14:11:31 2014 -0700

    Change to use local_file filename path so we save using original extension (rather than .fetch) on S3
touch up employee engagement instructions
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Merge pull request #9 from code-dot-org/staging

DTT