better whitespace splitting/matching
Fixes for weird title bar behavior between different styles.
Merge branch 'inline_entity_tiles' into async_entities

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