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
Stop labels from disappearing
Merge pull request #93 from dimagi/fix-graph-labels-218

Stop labels from disappearing
Fix for double management action enabled check
Merge pull request #95 from dimagi/double_management_fix

Double Management Fix
Version Number finalized
Merge branch 'commcare_2.18'

Conflicts:
	app/AndroidManifest.xml
	app/res/values/strings.xml
debuggable
Merge pull request #96 from dimagi/2.18_merge

2.18 merge
Merge branch 'master' into inline_entity_tiles

Conflicts:
	app/src/org/commcare/android/adapters/EntityListAdapter.java