Signed-off-by: honesty <371278698@qq.com>
Merge branch 'master' of git@github.com:wisegps/baba.git

Conflicts:
	src/com/wise/notice/LetterActivity.java
Signed-off-by: honesty <371278698@qq.com>
Merge branch 'master' of https://git@github.com/wisegps/baba.git

Conflicts:
	src/com/wise/show/PhotoActivity.java

Signed-off-by: wang <wang@wang-PC>