Lets pray
Merge branch 'master' of https://github.com/nickbdavis/GhostChat2

Conflicts:

GhostChat/bin/classes/com/example/ghostchat/ContactListView$PlaceholderF
ragment.class
	GhostChat/bin/classes/com/example/ghostchat/ContactListView.class