Will have to merge, changed to temporary thread.sleep() method in
MainActivity to avoid null pointer errors caused by faulty Google
Listeners for WifiP2p.
Merge branch 'master' of https://github.com/feitelsonc/Amp

Conflicts:
	src/com/amp/ClientAsyncTask.java