dimagi/core-hq — pull request #230 by dannyroberts (2012-11-12 19:31:10+00:00)
Title: Resource conflict

Fix a couple resource conflicts