[Commotion-admin] [Tidepools-Mobile] ip for etherpad and icon bugfix (#14)

[Griffin Boyce]

controllers.js was looking for icon `type` when it should have been looking for `subType`. This is now fixed.
You can merge this Pull Request by running:

  git pull https://github.com/glamrock/Tidepools-Mobile is4cwn

Or you can view, comment on it, or merge it online at:

  https://github.com/opentechinstitute/Tidepools-Mobile/pull/14

-- Commit Summary --

  * fixed spare }
  * changed ip to localhost
  * merge
  * ip addressing for etherpad

-- File Changes --

    M app/index.html (1)
    M app/js/angular-leaflet-directive.js (2)
    M app/js/bar.js (2)
    M app/js/controllers.js (2)
    M app/partials/landmark-detail.html (3)
    M app/partials/map.html (2)
    M tidepools_server.js (2)

-- Patch Links --

https://github.com/opentechinstitute/Tidepools-Mobile/pull/14.patch
https://github.com/opentechinstitute/Tidepools-Mobile/pull/14.diff
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20130926/a54e7408/attachment-0001.html>