fix #770 preserve temp token across validation failures
Merge pull request #787 from concerto/temp_token_preservation

fix #770 (preserve temp token across validation failures)
Looks good!
Feed selection saved when add content has validation error
Merge pull request #800 from concerto/feedSelection

Feed selection saved when add content has validation error
Fix plugin form redirect (bc88c61 had broken form errors)
Merge remote-tracking branch 'upstream/master'