GCM
Merge https://github.com/mwein/PictionaryLife

Conflicts:
	PictionaryLife/src/edu/msu/life/pictionary/GCMIntentService.java