jQuery conflict
Changes to main.js
Merge branch 'wd_backport' of github.com:waterdotorg/power.Water into wd_backport

* 'wd_backport' of github.com:waterdotorg/power.Water:
  Mobile image field added to post model

Merging into upstream branch
Using font awesome for icons instead of entypo
Merge branch 'wd_backport' of github.com:waterdotorg/power.Water into wd_backport

* 'wd_backport' of github.com:waterdotorg/power.Water:
  Instagallery on homepage view

Merging with upstream branch