add wifi local network communication feature
Merge branch 'master' of https://github.com/pjq/pushup

Conflicts:
	PushUp/src/main/AndroidManifest.xml
	PushUp/src/main/java/me/pjq/pushup/MainActivity.java
Merge pull request #2 from kicool/master

add wifi local network communication feature