Remove extraneous documentation file
Merge branch 'master' into development to include question edit layout changes.
Tweak width of combinator template field.