Test 5 million
merg testing
Merge branch 'master' of https://github.com/MichaelLeith/Android-Wireless

Conflicts:
	MainApp/res/layout/activity_scan.xml