changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
merge: warning: conflicts during mergemerging amerging a failed!32e80765d7fe+75234512624c+ tipsomething else=======somethingM a