Finish add friend activity on dialog backpressed if not connected
+gives alert dialog a more descriptive name
fixes conflict on merge
Merge branch 'dethstar-master'