add disconnect functionality
Merge branch 'master' of github.com:PDSD-2014/nistor-popescu

Conflicts:
	src/ro/cs/pub/pdsd/shareit/MainActivity.java