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
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