parse initial set up
Merge branch 'master' of https://github.com/lindayang/GroupVite

Conflicts:
	AndroidManifest.xml