ohmage/server — pull request #835 by stevenolen (2014-09-11 16:40:30+00:00)
Title: Revert "merge to 2.16.1"

Reverts ohmage/server#833