cicadas-2014/percolator — pull request #21 by gitnasty (2014-07-04 18:40:02+00:00)
Title: Resolve merge conflicts

* associated with the problem views from integrating with the javascript workflow