localhost default user = admin
whatever
Fixes #546
Merge branch 'master' of https://github.com/walkingtospace/codecombat
Merge remote-tracking branch 'codecombat/master'
Refactoring ModalView Templates
fixed issue #496
Update de.coffee
Merge pull request #580 from bahuma20/patch-1

Update de.coffee
Update es.coffee
Merge pull request #579 from ItsLastDay/popover

Fix for issue #496
Merge pull request #581 from pouyio/patch-1

Update es.coffee
Merged.
Last bits of #546.
Update hu.coffee
Update pt-PT.coffee for multiplayer
Merge pull request #583 from bbeasmile/patch-1

Update hu.coffee
Merge pull request #584 from batista/patch-1

Update pt-PT.coffee for multiplayer
Show videos in HD if possible. Use ready state on level loader.
Merge branch 'master' into production