WIP
Merge branch 'master' into pf-new-images

Conflicts:
	utils/make_thumbs.py
Re-building the images and script changes

Test Plan:
- Go to /cs/new/webpage
- Insert an <img>, see new food and landscapes categories show up
Restored some CSS styles
Build files
Fix matching SQL table results for more than 1 step with differing results

If step 1 of an SQL challenge had a result and you check for matching results, everything is ok.
But then on step 2, the template has 2 selects and 2 reuslts. So the step2 would pass, but the step 1
would fail because you had an extra result.

So the fix is just to allow more results and only check for the number of results in the template tables.

Test Plan:
- Test a challenge with 2 steps which both check results.

Auditors: pamela
Re-building the images and script changes

Test Plan:
- Go to /cs/new/webpage
- Insert an <img>, see new food and landscapes categories show up
Removing image picker images from build
Merge branch 'master' into pf-new-images

Conflicts:
	build/css/live-editor.ui.css
Merge pull request #194 from Khan/pf-new-images

Tweak image resizing script and add new images
Revert "Merge pull request #194 from Khan/pf-new-images"

This reverts commit e31e64a8595c2f7f32b006790151c452257aa6fc, reversing
changes made to 68526c015d51929b6f07573cb7713295ee0cbd1f.
Preserve PJS prototype function closures and scope from `with` on instances

Summary: Fixes T3129.

Test Plan:
- Load various top programs, and make sure they work as they should.
- Load the towers of hanoi scratchpad, make sure it works when changing the moving of plates on pegs:
  https://gist.githubusercontent.com/pamelafox/e71dd4c12a39df7ca10f/raw/0f9faeb62f8bdc3cc4db6c2f433c792faeb51ba3/gistfile1.js
- Run live-editor tests

Reviewers: pamela, john

Subscribers: #cs

Maniphest Tasks: T3129

Differential Revision: http://phabricator.khanacademy.org/D14396
Make sure prototype chain is preserved for function arguments which are objects

Summary: Fixes: T3206

Test Plan:
- Run this code and change the position of the text:
```
textFont(createFont("monospace"));
var draw = function() {
  background(255, 255, 255);
  fill(255, 0, 0);
  textSize(15);
  textAlign(CENTER, CENTER);
  text("Hi!", 200, 200);
};
```

Reviewers: pamela, john

Subscribers: #cs

Maniphest Tasks: T3206

Differential Revision: http://phabricator.khanacademy.org/D14397
Add support for skipping using a worker in certain cases (createGraphics)

Summary:
createGraphics currently creates a whole new Processing environment and fails within a worker.
This problem may be able to be fixed while still using the worker, but I don't think the time investment is worth it currently.

Test Plan: - Run the code from this program: https://www.khanacademy.org/cs/creategraphics-problem/5830471485489152

Reviewers: pamela, john

Subscribers: #cs

Maniphest Tasks: T3285

Differential Revision: http://phabricator.khanacademy.org/D14399
Change debounce to 800ms, after user feedback

Test Plan:
- Do a challenge, see what it feels like

Auditors: alexrodrigues
Improve thumbs script

Summary: I changed the script so that when I call it with no arguments, it just Does The Right Thing (makes original and thumbs).

Test Plan: - Run script on an images directory, it should automatically resize and make thumbs

Reviewers: alexrodrigues

Reviewed By: alexrodrigues

Subscribers: #cs

Differential Revision: http://phabricator.khanacademy.org/D14419
Adding new photos for HTML image picker usage

Test Plan:
- No visible change in PJS or webpage, as I will do a separate change to put them in images.js
Adding new photos for HTML image picker usage

Test Plan:
- No visible change in PJS or webpage, as I will do a separate change to put them in images.js
Merge pull request #199 from Khan/pf-new-photos

New photos in /images
Add new images to image picker, including Holiday tab

Summary:
This adds holiday images to image picker, making them really easy to find
via the Holiday tab. We can move them back into photos after HOC season.

Test Plan:
- Go to /cs/new/webpage, insert an image from Clipart tab, see nav-pills on side
- Insert an image from Photos tab, see nav-pills on side
- Insert an image from Holiday tab, don't see nav-pills on side

Reviewers: alexrodrigues

Reviewed By: alexrodrigues

Subscribers: #cs

Differential Revision: http://phabricator.khanacademy.org/D14450