Minor fixes for using inline tile display
Fix for syntax error in form  entry screen layout
Merge branch 'inline_entity_tiles' into partograph_trials

Conflicts:
	res/layout/screen_form_entry.xml