Facebook friends patch
Fix Placement Agreement typo
Clean up mixed quotes
new translations

i translated some parts, will translate more later
Fixed doober alignment
Made the deltas lib conflict identifying library able to handle many-to-many conflicts.
Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.
Clean up for coffeescript convention
Merge master into branch
Made sure applyDelta is called in all cases
proofed the SearchView's runSearch
Merge pull request #1254 from rubenvereecken/teeny_weeny_search_fix

proofed the SearchView's runSearch
Cleaned up patch rendering logic
Merge pull request #1256 from rubenvereecken/patch_fix

Patch fix: applyDelta now always called
Fixes #1223
Making the ladder tab reload when social network friends load. See #1196.
Handled conflicts, throwing out changes to ladder_tab.coffee.
Merge branch 'thgil-fb'
Merge pull request #1242 from differentmatt/master

Fix Placement Agreement typo
Merged conflicts.
Merged conflicts.