fixes #839
allow application/x-www-form-urlencoded for campaign/update. fixes #646, based on f33fa18783ab693e4176c8e380ef2643364160e5
Merge pull request #840 from stevenolen/master

fixes #839
Merge pull request #843 from ohmage/ohmage-2.16

Ohmage 2.16