Lite buggfix och rensat lite kod
 Sak
Merge branch 'merge' of https://github.com/eliaskarnsund/SkyNet

Conflicts:
	src/com/network/skynet/MainActivity.java
	src/com/network/wifidirect/DeviceDetailFragment.java
	src/com/network/wifidirect/FileTransferService.java
Fixat fel efter merge