use localized decimal
Switch taskId back to task_id

Summary:
The client was changed from task_id to taskId in http://phabricator.khanacademy.org/D8297,
the server was changed to accept both task_id or taskId in http://phabricator.khanacademy.org/rGWcde63d08f3b2e03b4234e5b83201610cfaa8cb2a

And now we're changing the client from taskId back to the original task_id!
In a short while, I'll change the server back to only accept task_id, as before.

Going to add a Perseus person in case this affects you in some way! Lucky Jack!

Reviewers: mgp, jack, benkomalo, laura

Reviewed By: benkomalo, laura

Differential Revision: http://phabricator.khanacademy.org/D8423
Remove semicolon from requirejs.config.js

The semicolon in requirejs.config.js from
706493cb4193b52f203ea4a45c4522f8a62e714a was causing r.js to not
understand this configuration file.

Test Plan: substate and make sure jenkins starts working again

Auditors: tom
Merge remote-tracking branch 'upstream/master'
Merge pull request #161346 from pjmattingly/master

Updated khan-exercise to fix dependencies in 'congruency' utility
Keep the points in front!

I find it hard to believe I didn't catch this earlier...

Test Plan:
1. Load graphing_inequalities.html and graphing_inequalities_2.html in local mode.
2. Drag a point.
3. See https://s3.amazonaws.com/uploads.hipchat.com/6574/49847/XZzptRZSBkqtTAz/upload.png instead of https://s3.amazonaws.com/uploads.hipchat.com/6574/49847/jsNjObFKhW6nAHd/upload.png

Auditors: jack
Allow shading the area under a graphie-plotted function

Summary: Shading a parametric equation perhaps doesn't make a ton of sense by itself, but maybe it'll be useful.

Test Plan:
In graphie-to-png:

```
plot(function(x) {
    // Function to shade under
    return 0.03 * (x+5)*(x+2)*(x-3)*(x-6);
}, [-5, 3], // <-- x-range to shade
    false, true, { stroke: BLUE, fill: BLUE, opacity: 0.3 }
);

plot(function(x) {
    // Plot the entire function
    return 0.03 * (x+5)*(x+2)*(x-3)*(x-6);
}, X_RANGE);
```

Reviewers: jack

Reviewed By: jack

Subscribers: alpert

Differential Revision: http://phabricator.khanacademy.org/D8116
move header text addition to problem-template.handlebar

Summary: This is the companion commit to http://phabricator.khanacademy.org/D8419 which makes header text appear for both Perseus and old style exercises.  It removes the code from khan-exercise.js which added psych. intervention header text, since headers are now added in problem-template.handlebar instead.

Test Plan: ran on local dev_appserver

Reviewers: colinfuller, mattfaus, alpert

Reviewed By: alpert

Subscribers: benjaminhaley, jace

Differential Revision: http://phabricator.khanacademy.org/D8501
substate kas / subkas
Changing kline.equal() to strict collinearity check.
Merge remote-tracking branch 'upstream/master' into kline_equal_optimize
Limit the number of times we try and remake a bad problem.

Summary:
While investigating https://github.com/Khan/khan-exercises/issues/161349
it turned out that MakeProblem kept failing, and we kept trying, until
we hit the maximum call-stack size.  In the meantime (many minutes on my
computer) the browser froze.  This change is intended to break out of this
call stack loop when this happens again.

Test Plan:
http://localhost:8080/student-res/algebra1-brushup/quad-eqns-brushups/e/solutions_to_quadratic_equations?lang=es
See that after a second a warning gets spit out into the console.

Reviewers: eater

Reviewed By: eater

Subscribers: jack, alpert

Differential Revision: http://phabricator.khanacademy.org/D8547
modifying to apply proposed changes as per code review re: #161350
Merge remote-tracking branch 'upstream/master' into kline_equal_optimize
subkas
Merge pull request #161350 from pjmattingly/kline_equal_optimize

Changing kline.equal() to strict collinearity check.
Avoid another wrong wrong answer

Reviewers: eater

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D8170
Add expression entry and improve hints

Reviewers: eater

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D8172
Happy New Year
Merge pull request #161351 from InPermutation/master

Update copyright year to 2014