Stashing change
Issue 1841: Added cucumber test
Merge branch 'master' into issue_1841
Merge branch 'master' into issue_1841
Merge branch 'i18n' of git://github.com/otwcode/otwarchive
Merge branch 'master' of git://github.com/otwcode/otwarchive
Merge branch 'master' of git://github.com/otwcode/otwarchive
get master in sync
The start of work to pull the ts calls out of the application helpers so we
ensure that ts is not called twice eg ts(ts('AO3 News'))
Didn't use symbols correctly
Add more things to the header key
Add a dashboard key
Make mergable
Raise ActiveRecord::RecordNotFound when we don't find things
Follow Elz's comments ( make test simpler ).
Raise more  ActiveRecord::RecordNotFound
Probably want /bookmarks to still work
Issue 1331 - Correct formatting on home page button and refine behaviour for logged in users when invitations are not required.
Fix test
I think this is what we want