Includes GCM demo
Merge branch 'master' of https://github.com/ccstevens/textchap.git

Conflicts:
	textchap/AndroidManifest.xml
	textchap/res/layout/activity_main.xml
	textchap/src/com/example/textchap/MainActivity.java