Just my changes
Merge branch 'develop' into dans-styling-branch3
Start on tagging proposals

* Add tags field to ProposalBase
* Verify we can edit tags in the admin
* Display a proposal's tags in the reviews table, also in the proposal
  details on the review page
* Enable the reviews template context processor so we can navigate
  in the reviews area
* Add a form on the Reviews page to edit proposal tags.
Constrain memberships to uniqueness

Add constraint on (user, team)
Move review table help above table and mark for translation.
Merge branch 'feature/talk-tagging' into develop
Merge branch 'feature/133-dupe-memberships' into develop
Fixes #134; delineates a per-proposal type CMS Box on the proposal submission form for explicit instructions/descriptive text on the form
Merge pull request #94 from caktus/dans-styling-branch3

Database & Association Pages
Bad rendering on proposal details if no tags

If a proposal has no tags, on the Proposal Details page, the
value of the Category gets displayed shifted up so it looks like
that's the tags value.

Apparently this is a problem with all the "dd" tags on this page,
because I see all the other ones have &nbsp; appended.

So, doing the same for tags.
Merge branch 'feature/134-explicit-cms-box-per-proposal-type' into develop
Merge branch 'develop' into feature/53-integrate-status-review-fields

Conflicts:
	symposion/templates/reviews/review_list.html