Fixing potential security/stability flaw with autoescaping
Merge branch 'activedev' of github.com:WheatonCS/Lexos into activedev
Trying to make conflicts:
Fixing the artificial conflicts