Fix endlines at the ends of some files. Fix corroded entities in khan-exercise.html. Fix broken data-if expression.
Merge with master.