added isTranslationPatch method to patches
Corrected statistic logic, wrote test case
Achievement recalculation is now covered with tests
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.
Merge branch 'kumabotz-cleanup-mixed-quotes'
Merge branch 'master' of https://github.com/codecombat/codecombat
Merge pull request #1245 from greyhusky/patch-2

new translations
Merged conflicts.
Merged conflicts.
Merge branch 'kumabotz-coffeescript-convention'