chganges in table structure and some code changes in commcare case listener
Merge branch 'dev/mcts-bundle' of https://github.com/motech/mcts-integration into dev/mcts-bundle

Conflicts:
	mcts-beneficiary-sync/src/main/java/org/motechproject/mcts/integration/service/LocationDataPopulator.java
	mcts-beneficiary-sync/src/test/java/org/motechproject/mcts/integration/service/FLWDataPopulatorTest.java
	mcts-beneficiary-sync/src/test/java/org/motechproject/mcts/integration/service/LocationPopulatorTest.java