Stashing change
Issue 1841: Added cucumber test
Merge branch 'master' into issue_1841
Merge branch 'master' into issue_1841
4070 Bookmark filter labels and inputs not associated
Add persistence_token for users
4048 Move ul tag so it closes in the right spot
4048 Whitespace, quotation marks, syntax cleanup
Merge pull request #1786 from sarken/issue_4070

4070 Bookmark filter labels and inputs not associated
Use different persistence tokens
Merge pull request #1788 from sarken/issue_4048

4048 Invalid HTML on new tags page
Merge pull request #1787 from sarken/users_fixture

Add persistence_token for users
Merge pull request #889 from scottsds/issue_1841

Editing collection: error 500 if collection name is removed