New feature to allow activities to include the last available selected entity's grid view tile inline to contextualize the app
persistent display now can be triggered by an activity feeding up an EC/detail for interstitial or activity specific context
Merge branch 'master' into inline_entity_tiles

Conflicts:
	app/src/org/commcare/android/view/GridEntityView.java
fixed optional tile in selection.
First implementation of expand/contract. Slightly rough.
Introduced inline entity concept
fixed fragment not re-connecting properly across lifecycle changes.
Fixed bug on resuming with old data still enabled
Asynchronous entity loading for performance
Fixed layout ordering problem when expanding the screen
Merge branch 'inline_entity_tiles' into async_entities
Merge branch 'master' into async_entities
SqlLite Migration to 3.0. Kind of rough because big UserDb's are going to take a really long time to update, need to profile one to make sure people don't accidentally cancel, maybe try to get things set up asynchronously?
Merge branch 'master' into inline_entity_tiles

Conflicts:
	app/res/values/colors.xml
Merge branch 'inline_entity_tiles' into async_entities
Added v7a arm binaries
Big chunk of performance improvement code for 2 major use cases:

1) Rapidly building storage tree roots for densely packed datasets
2) Adding the ability to execute predicate expressions with the previous context also evaluated (which makes [small set][large set] abstract predicate evaluation waaaaay faster)
Merge branch 'sql_cipher_update' into async_entities

Conflicts:
	app/src/org/commcare/android/database/DbUtil.java
	app/src/org/commcare/android/database/global/DatabaseGlobalOpenHelper.java
First Round implementation of asynchronous entity caching and a pile of strategies that prevent O(N) table scans.
Introduced a separate index table to be able to do fast lookups on what case records are indexing other records.