Merge branch 'feature_flags' into inline_entity_tiles
Feature flag'd the top-nav option
Fixed "Back" Action being attached to the action bar for login screens and home screen
Merge branch 'inline_entity_tiles' into async_entities
Merge branch 'async_entities' into tdh_demo

Conflicts:
	app/res/xml/preferences_developer.xml
	app/src/org/commcare/dalvik/preferences/DeveloperPreferences.java
added a few more things to gitignore
added newline
ok, forget those .settings directories...I think my mac eclipse did something weird
Merge pull request #82 from dimagi/feature_flags

Added a Feature Flag area for CommCare Android
remove *
good save point
Merge branch 'master' of https://github.com/dimagi/commcare-odk
update dev versions
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