Closes #80, closes #77

* Hid empty element from preferences screen
* Added 'Try to reconnect' setting
Fixed merge conflicts, added check for reconnect check box

Conflicts:
	res/values/strings.xml