Merge branch 'Sumedha'
collabrify events now sending/recieving
put event and base protocols in src/
Merge branch 'master' of https://github.com/pramodsum/Penning

Conflicts:
	src/edu/umich/penning/CollabEditTextListener.java
	src/edu/umich/penning/MainActivity.java
Merge branch 'master' into Sumedha