modify MainActivity
Merge branch 'master' of https://github.com/infocorenj/Traffic

Conflicts:
	src/com/example/traffic/MainActivity.java
	src/com/example/traffic/WifiStateReceiver.java
modify mainactivity