New affordances (matching the Navigation Bar) for Suite menus
implementation in generic menus
Merge branch 'feature_flags' into menu_nav_affordances
Feature Flag'd menu affordances
added a few more things to gitignore
added newline
ok, forget those .settings directories...I think my mac eclipse did something weird
remove *
update dev versions
Merge pull request #87 from dimagi/update_versions_2

update dev versions
2.18 version updates
Merge pull request #88 from dimagi/218_v_updates

2.18 version updates
Revert "good save point"

This reverts commit 5ff00b910414cd86b50d5ec57b02246ae8e8174b.
Merge branch 'commcare_2.18' of https://github.com/dimagi/commcare-odk into commcare_2.18
Merge branch 'master' of https://github.com/dimagi/commcare-odk
Merge pull request #85 from dimagi/updates-to-gitignore

added a few more things to gitignore
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