change to my properties file
Merge branch 'master' of https://github.com/lindayang/GroupVite

Conflicts:
	project.properties
Merge branch 'master' of https://github.com/lindayang/GroupVite
latest changes from others
Merge branch 'master' of https://github.com/lindayang/GroupVite

Conflicts:
	project.properties
	src/com/groupvite/ContactsActivity.java
	src/com/groupvite/EventsActivity.java
	src/com/groupvite/GroupViteApp.java
Merge branch 'master' of https://github.com/lindayang/GroupVite
Stop tracking project.properties file