start annotator edits
add explanation field when edit is selected
Merge branch 'master' into issue220

Conflicts:
	public/css/style.css
still working on event cancellation
finish redlining feature
Merge pull request #309 from opengovfoundation/issue220

Issue220