no message
Merge branch 'master' of https://github.com/hsb0818/whard_android

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Nino.apk
	bin/classes.dex
	bin/classes/com/example/nino/MainActivity.class
	bin/classes/com/example/nino/R$drawable.class
	bin/classes/com/example/nino/R$id.class
	bin/classes/com/example/nino/R$layout.class
	bin/classes/com/example/nino/R$string.class
	bin/classes/com/example/nino/R$style.class
	bin/classes/com/example/nino/R$styleable.class
	bin/classes/hsb/HSBJson.class
	bin/resources.ap_
	gen/com/example/nino/R.java
	src/com/example/nino/MainActivity.java