Demo prep
Merge branch 'responder-jeffbl' of https://github.com/srl-mcgill/rter into responder-jeffbl

Conflicts:
	android/rter/src/ca/nehil/rter/streamingapp2/StreamingActivity.java