tlc
Merge branch 'master' of ssh://git@github.com/kmarshj/jingli.git

Conflicts:
	src/com/zdht/jingli/groups/ui/MainActivity.java