for automatic wifi connection
Merge remote-tracking branch 'origin/sprint1' into sprint1_copy

Conflicts:
	app/src/main/java/com/example/android/wifidirect/HybridMANETDTN.java