Merge pull request #326 from codecombat/master

Merging master into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #359 from codecombat/master

Merge master into production
Merge pull request #363 from codecombat/master

Merge master into production
Merge pull request #366 from codecombat/master

Merge master into production
Merge pull request #367 from codecombat/master

Manually specified tv4 version to fix npm checksum error
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #386 from codecombat/master

Merge master into production
Merge branch 'master' into production
Fixed the placement of the music note in the playback view.
Set up indie sprites and their avatars to use the new colorConfig property.
Merge branch 'production'
Merge branch 'master' of https://github.com/codecombat/codecombat