Fixed khan-exercises.js to include changes lost during merge conflict.
Merge remote-tracking branch 'upstream/develop' into develop