bread crumbs Fahad
Merge remote branch 'upstream/master'
Merge pull request #2 from UW-ICTD/master

Adding back changes made to release version.
Cleaning up + fixing some style problems + updating js-xlsx
Merge remote branch 'upstream/master'
changed phonegap version in config
Merge pull request #1 from tperrier/master

Cleaning up and fixing style issues