Adding PREMODERATED and POSTMODERATED access levels
More parsing vulnerability upgrades.
Merge branch 'master' into memberships
Merge branch 'memberships' of https://github.com/documentcloud/documentcloud into memberships

Conflicts:
	lib/dc/access.rb
Fixup allowed_to_comment method to not use the COMMENT_LEVELS convenience access level array.
Return the author information on annotations.

This is needed to determine whether or not to show the editing controls on annotation editor