OpenGeoscience/geojs — pull request #238 by aashish24 (2014-11-21 21:30:32+00:00)
Title: Resolved merge ui

Resolved merged conflict and by pushing here making sure that all of the tests are passing