guardian/frontend — pull request #5318 by robertberry (2014-07-31 16:45:01+00:00)
Title: Reduce merge conflicts

:trollface: