Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch

Conflicts:
	app/initialize.coffee
	bower.json

bower.json

@@ -37,15 +37,11 @@
     "firebase": "~1.0.2",
     "catiline": "~2.9.3",
     "d3": "~3.4.4",
-<<<<<<< HEAD
     "jsondiffpatch": "~0.1.5",
-    "nanoscroller": "~0.8.0"
-=======
     "nanoscroller": "~0.8.0",
     "jquery.tablesorter": "~2.15.13",
     "treema": "~0.0.1",
     "bootstrap": "~3.1.1"
->>>>>>> master
   },
   "overrides": {
     "backbone": {
@@ -60,10 +56,9 @@
     "underscore.string": {
       "main": "lib/underscore.string.js"
     },
-<<<<<<< HEAD
     "jsondiffpatch": {
       "main": ["build/bundle-full.js", "build/formatters.js", "src/formatters/html.css"]
-=======
+    },
     "jquery.tablesorter": {
       "main": [
         "js/jquery.tablesorter.js",
@@ -79,7 +74,6 @@
         "./dist/fonts/glyphicons-halflings-regular.ttf",
         "./dist/fonts/glyphicons-halflings-regular.woff"
       ]
->>>>>>> master
     }
   }
 }

server/levels/level_handler.coffee

@@ -38,12 +38,9 @@ LevelHandler = class LevelHandler extends Handler
     return @getLeaderboardFacebookFriends(req, res, args[0]) if args[1] is 'leaderboard_facebook_friends'
     return @getLeaderboardGPlusFriends(req, res, args[0]) if args[1] is 'leaderboard_gplus_friends'
     return @getHistogramData(req, res, args[0]) if args[1] is 'histogram_data'
-<<<<<<< HEAD
-    super(arguments...)
-=======
     return @checkExistence(req, res, args[0]) if args[1] is 'exists'
     return @sendNotFoundError(res)
->>>>>>> master
+    super(arguments...)
 
   fetchLevelByIDAndHandleErrors: (id, req, res, callback) ->
     @getDocumentForIdOrSlug id, (err, level) =>

server/users/user_handler.coffee

@@ -173,12 +173,9 @@ UserHandler = class UserHandler extends Handler
     return @getNamesByIds(req, res) if args[1] is 'names'
     return @nameToID(req, res, args[0]) if args[1] is 'nameToID'
     return @getLevelSessions(req, res, args[0]) if args[1] is 'level.sessions'
-<<<<<<< HEAD
-    super(arguments...)
-=======
     return @getCandidates(req, res) if args[1] is 'candidates'
     return @sendNotFoundError(res)
->>>>>>> master
+    super(arguments...)
 
   agreeToCLA: (req, res) ->
     return @sendUnauthorizedError(res) unless req.user