robin - added a bunch of new stuff, trying it out
Merge remote-tracking branch 'origin/master'

Conflicts:
	DataCommChat/AndroidManifest.xml
	DataCommChat/res/layout/activity_main.xml
	DataCommChat/src/com/example/datacommchat/MainActivity.java
robin - added a bunch of new stuff, trying it out