dev ver 1.0
Merge remote-tracking branch 'origin/dev'

Conflicts:
	GCMClient/src/net/gringrid/gcmclient/MainActivity.java