WifiDirect och location-saken mergeat
Merge branch 'master' of https://github.com/eliaskarnsund/SkyNet into wifip2p

Conflicts:
	res/layout/fragment_main.xml
	res/values/strings.xml
	src/com/network/networkMonitor/NetworkMapDataSource.java
	src/com/network/skynet/MainActivity.java
Några småfixar efter merge
Merge pull request #1 from eliaskarnsund/wifip2p

Wifip2p