Display annotations tagged as edit differently
add ushouse to master branch stages
add subscribe link to header
update .gitignore files for automated import files from us-house branch
fix doc list filter replication
fix doc list filter (for real)
fix doc list filter (not kidding)
fix all annotations displaying as edits, add annotation ids
Merge branch 'master' into dc

Conflicts:
	app/views/layouts/header.blade.php
add direct links to annotations, activity bar annotation link icons, annotation bar icon titles
finish direct linking and copy to clipboard.  Resolves #193.
Merge branch 'master' into dc