Enabled contribution to collaborative capsules (Sam N, John K)
Merge remote-tracking branch 'origin/master'

Conflicts:
	chc_application/src/chc/activities/InterfaceBaseActivity.java
	chc_application/src/chc/activities/MessageParametersActivity.java