11
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/zdht/jingli/groups/ui/MainActivity.java
1
Merge branch 'master' of ssh://git@github.com/kmarshj/jingli.git