alpha
Fixed model bug in new detail text form
Merge pull request #18 from dimagi/detailmodelfix

Fix for FB142577
Merge branch 'master' into inline_entity_tiles
Merge branch 'inline_entity_tiles' of github.com:dimagi/commcare into inline_entity_tiles
Update submit_build.py
Update build.properties
Merge pull request #24 from dimagi/216

2.16 release prep
Update build.properties for 2.16.1
Merge branch 'commcare_2.16' into 2_16_merge

Conflicts:
	application/build.properties
	backend/src/org/commcare/suite/model/Detail.java
Merge branch 'inline_entity_tiles' of github.com:dimagi/commcare into inline_entity_tiles
Merge pull request #26 from dimagi/2_16_merge

2 16 merge
fix missing variable
Merge pull request #28 from dimagi/2_16_merge

fix missing variable
Merge branch 'master' into inline_entity_tiles
Merge branch 'inline_entity_tiles' of https://github.com/dimagi/commcare into inline_entity_tiles
Merge branch 'inline_entity_tiles' into async_entities