more button fixes, added toasts
button toast changes
Revert "button toast changes"

This reverts commit a78c0aa1e163fdbd7b04ca3aed8db0c7d22f1877.
included collabrify library

not yet fully functional
collabrify connect/join/leave working

now, to implement text edit communcations…
Merge branch 'collabrify_lib_dev'
Merge branch 'master' into Sumedha

Conflicts:
	src/edu/umich/penning/CollabEditTextListener.java
	src/edu/umich/penning/MainActivity.java