Fixes for unit portraits.
Set up talking portraits in the hud.
Merge branch 'master' of https://github.com/codecombat/codecombat

Conflicts:
	app/views/play/level/hud_view.coffee
A bit more CoffeeScript-y.
Merge branch 'master' of https://github.com/codecombat/codecombat
Update names.coffee
Merge pull request #124 from Tavio/patch-3

Update names.coffee
Fix "Contact" link in footer not properly changing cursor to pointer
Update names.coffee
Merge pull request #126 from Dman19993/patch-1

Update names.coffee
We can now run all test on the server.
99 tests, 220 assertions, 13 failures

2 tests are disabled in file.spec.coffee
because they cause a fatal error.
Merge pull request #129 from smoratinos/master

All server tests now run without fatal errors.
Set up thang avatar views with the new db portraits.
Merge branch 'master' of https://github.com/codecombat/codecombat
Merge pull request #125 from p-buse/master

Fix "Contact" link in footer not properly changing cursor to pointer
Update ru.coffee

Updated ru.coffee with the actual Russian translation of all the strings.
Merge pull request #130 from fess89/master

Update ru.coffee
Fixed a couple syntax issues in Russian locale..
Update ru.coffee

Added a missing quote at the last line.
Merge pull request #132 from fess89/master

Update ru.coffee