仓库管理界面调整
Merge branch 'master' of https://github.com/bigtotorouk/mendian.git

Conflicts:
	mdgj/bin/classes.dex
	mdgj/bin/classes/com/mdgj/R$id.class
	mdgj/bin/classes/com/mdgj/R$layout.class
	mdgj/bin/classes/com/mdgj/R$menu.class
	mdgj/bin/classes/com/mdgj/R$string.class
	mdgj/bin/classes/com/mdgj/R$style.class
	mdgj/bin/mdgj.apk
	mdgj/bin/resources.ap_
	mdgj/gen/com/mdgj/R.java