[#70328664]: make callout dismiss automatically
convert .script files to ascii before importing (handle smart-quotes)
Merge pull request #559 from code-dot-org/studio_callout_tweak

[#70328664]: make callout dismiss automatically
Merge pull request #560 from code-dot-org/script_ascii

convert .script files to ascii before importing (handle ‘smart quotes’)
fix locale errors on build.
- config.i18n.enforce_available_locales = false.
- modify LOCALES setter to stop warning on Rails startup.
Merge pull request #561 from code-dot-org/fix_locale_errors

fix locale errors on build.
refactor seed:games
Automatically built.
Merge pull request #562 from code-dot-org/seed_games

refactor seed:games
sprite->actor, add callout to indicate how to use say block
Merge pull request #563 from code-dot-org/studio_usability

sprite->actor, add callout to indicate how to use say block
Automatically built.
Automatically built.
Automatically built.
fix bug with stale instructions after locale switch (w/tests)
Merge pull request #565 from code-dot-org/fix_instructions_locale_switch

fix bug with stale instructions after locale switch (w/tests)
Fix iOS 7 callout test (YouTube video loading causes tests to hang)
Merge pull request #567 from code-dot-org/fix_callout_test_ios

Fix iOS 7 callout test (YouTube video loading causes iOS Driver tests to hang)
Merge branch 'finished' into multi

Conflicts:
	app/models/game.rb
	lib/tasks/seed.rake
Misc updates, mainly from code review.