Kill the adb-server when the Connect->Reset Menu item is used.

Change-Id: I3619cd1adb2e8eb905177eae5f13c1c731454bd5
Move Companion Version numbers to YaVersion.java

Change-Id: I5d389f706641b6469335b2cd98c6b327431bfd9b
Fix Generic Components Collapsed Title

Fixes #582. Collapsed Generic blocks now get a reasonable collapsed
name instead of causing an exception which causes the blocks for a
screen to fail to load.

Change-Id: I5c1877c2acd04f2f01a44e0c8f56f4e5020ccd66