修改了一些小bug
Merge remote-tracking branch 'origin/zhyq' into zhyq

Conflicts:
	com.store.smhilaw1.MainActivity/AndroidManifest.xml
	com.store.smhilaw1.MainActivity/bin/AndroidManifest.xml
	com.store.smhilaw1.MainActivity/bin/resources.ap_
	com.store.smhilaw1.MainActivity/src/com/store/smhilaw1/MainActivity1.java
一些小的改动，修复一些bug