Merge branch 'master' of
https://github.com/remembergrace-dev/jituofu_android.git

Conflicts:
	2.0/bin/classes.dex
	2.0/bin/resources.ap_
	2.0/res/values/strings.xml
	2.0/src/com/jituofu/ui/UIIhome.java
Merge branch 'master' of
https://github.com/remembergrace-dev/jituofu_android.git