error free
Merge remote-tracking branch 'origin/master'

Conflicts:

	UnleashGame/bin/classes/teamAweosme/DRS/unleashgame/DeviceListFragment$1.class

	UnleashGame/bin/classes/teamAweosme/DRS/unleashgame/DeviceListFragment$WiFiPeerListAdapter.class

	UnleashGame/bin/classes/teamAweosme/DRS/unleashgame/DeviceListFragment.class
	UnleashGame/bin/classes/teamAweosme/DRS/unleashgame/HostGame.class

	UnleashGame/bin/classes/teamAweosme/DRS/unleashgame/WiFiDirectBroadcastReceiver.class

	UnleashGame/src/teamAweosme/DRS/unleashgame/WiFiDirectBroadcastReceiver.java