Merge branch 'master' of https://github.com/codecombat/codecombat

Conflicts:
	app/lib/simulator/Simulator.coffee

app/lib/simulator/Simulator.coffee

@@ -55,6 +55,7 @@ module.exports = class Simulator extends CocoClass
     console.log info
     @trigger 'statusUpdate', info
     @simulateAnotherTaskAfterDelay()
+    application.tracker?.trackEvent 'Simulator Result', label: "No Games"
 
   simulateAnotherTaskAfterDelay: =>
     console.log "Retrying in #{@retryDelayInSeconds}"
@@ -170,6 +171,7 @@ module.exports = class Simulator extends CocoClass
     unless @options.headlessClient
       simulatedBy = parseInt($('#simulated-by-you').text(), 10) + 1
       $('#simulated-by-you').text(simulatedBy)
+    application.tracker?.trackEvent 'Simulator Result', label: "Success"
 
   handleTaskResultsTransferError: (error) =>
     @trigger 'statusUpdate', 'There was an error sending the results back to the server.'
@@ -271,6 +273,7 @@ module.exports = class Simulator extends CocoClass
     if spellTeam not in playerTeams then useProtectAPI = false
     @spells[spellKey].thangs[thang.id].aether = @createAether @spells[spellKey].name, method, useProtectAPI
 
+
   transpileSpell: (thang, spellKey, methodName) ->
     slugifiedThangID = _.string.slugify thang.id
     generatedSpellKey = [slugifiedThangID,methodName].join '/'

app/views/play/ladder/simulate_tab.coffee

@@ -38,6 +38,7 @@ module.exports = class SimulateTabView extends CocoView
   # Simulations
 
   onSimulateButtonClick: (e) ->
+    application.tracker?.trackEvent 'Simulate Button Click', {}
     $("#simulate-button").prop "disabled", true
     $("#simulate-button").text "Simulating..."
 

app/views/play/level/tome/problem_alert_view.coffee

@@ -17,7 +17,7 @@ module.exports = class ProblemAlertView extends View
 
   getRenderData: (context={}) ->
     context = super context
-    format = (s) -> s?.replace('<', '&lt;').replace('>', '&gt;').replace("\n", "<br>")
+    format = (s) -> s?.replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g, '<br>')
     message = @problem.aetherProblem.message
     age = @problem.aetherProblem.userInfo.age
     if age?