Merge branch 'master' of https://github.com/Yichou/common.git

Conflicts:
	src/com/yichou/common/utils/CrashUtils.java
Merge branch 'master' of https://github.com/Yichou/common.git