Signed-off-by: LiShuai <80817774@qq.com>
Merge branch 'newbranch' of
https://github.com/lishuaijuly/vivi-android.git into newbranch

Conflicts:
	src/com/vivimsile/conf/ConfImpl.java
	src/com/vivismile/tool/DatabaseHelper.java

Signed-off-by: LiShuai <80817774@qq.com>