test3
working alpha1
Merge branch 'master' into master2

Conflicts:
	src/com/uiuc/puretest/ClientActivity.java