changes to matches and multis from staging
Merge remote-tracking branch 'remotes/origin/level-builder' into finished

Conflicts:
	config/locales/multi.en.yml
	config/scripts/course2.script
staging changes to matches/multis
Merge branch 'finished' of github.com:code-dot-org/dashboard into finished

Conflicts:
	config/locales/match.en.yml
Removing double key value pairs for portuguese and chinese
new translations as of 07-14
Automatically built
fix for jigsaw ui test
Merge pull request #1005 from code-dot-org/uiTest

fix for jigsaw ui test
Automatically built
Unplugged activity updates
- Support new lesson plans, pairs of links to html and pdf documents
- Show lesson plan html in an iframe
- Move videos to use specified keys rather than assumed the same as unplugged level key
- Add first course's unplugged levels
Hide lesson plans and PDF buttons when user is a logged-in student
- Add tests for lesson plan hiding
add test for eg. /s/course1/puzzle/next
.gitignore emacs autosave files
Add new unplugged activities
Add nice headings to /s/course1 (& 2,3) and add a new /beta page listing all three courses.
Merge branch 'finished' of github.com:code-dot-org/dashboard into finished
Add crowdsourcing lesson plan
Merge pull request #1007 from code-dot-org/unplugged_updates

Unplugged activity updates
Merge pull request #1008 from code-dot-org/finished

Deploy to level builder