code style : wrap some lines that exceeds 120 characters, replace some '=>' by '->'
undo a line wrapping, because this change the logic in common schema.
Merge pull request #114 from smoratinos/master

code style : wrap some lines that exceeds 120 characters, replace some '=>' by '->'
Fixed logging in with facebook and google plus to not overwrite existing user settings.
Fixed logging out to update the header properly.
Merge branch 'production'
Added chown to bower_components directory
Fixed #97 by updating Fancy Select.
Merge branch 'master' of https://github.com/codecombat/codecombat
Fixed #96.
Fixes for unit portraits.
If you have pressed esc, do not get prompted about it
Merge pull request #119 from rhc2104/remove-esc-prompt

If you have pressed esc, do not get prompted about it
Fixed temporary directory removal bug
Update no.coffee

Translated the text into Norwegian (Bokmål)
Merge pull request #122 from bardeh/patch-1

Update no.coffee
Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded.
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.