Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from codecombat/master

Merge with codeCombat
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from codecombat/master

update
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from codecombat/master

Update
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from codecombat/master

update
Merge branch 'master' of https://github.com/Darredevil/codecombat
Added joke tip
Merge branch 'master' of https://github.com/Darredevil/codecombat
Update play_view.coffee

Added "Guide Everyone Home" level
Merge pull request #1277 from gosnat/patch-9

Update play_view.coffee
Fixed #1198
Fixed #1276
Proper Treema node behavior for different code languages in default code, property documentation, and snippets.
Made creating components open to everyone!
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/templates/play/level/level_loading.jade
Merge branch 'master' of https://github.com/codecombat/codecombat into codecombat-master