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