good save point
Merge branch 'master' of https://github.com/dimagi/commcare-odk
update dev versions
Merge branch 'master' of https://github.com/dimagi/commcare-odk
Merge branch 'master' of https://github.com/dimagi/commcare-odk
add localization
Revert "good save point"

This reverts commit 5ff00b910414cd86b50d5ec57b02246ae8e8174b.
Merge pull request #91 from dimagi/localization_update_2

Localization update