null checks prevent crash when ODK Collect not installed
Merge branch 'bshTemp' into 16October2014Milestone