Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge branch 'master' of github.com:davidrd/Markus
Fixed issue 1405
Merge pull request #1407 from davidrd/issue-1405

Closes #1405: input and animation lag on spreadsheet
Submitted code will now be sanitized for HTML before being displayed
Merge pull request #1409 from gillianchesnais/issue-1340

Closes #1340: Viewing a file interprets <> as tag characters