commit from branch_dan
Merge remote-tracking branch 'origin/branch_christina'

Conflicts:
	src/com/catenary/testmerge/MainActivity.java
Merge branch 'master' into branch_christina

Conflicts:
	bin/classes/com/catenary/testmerge/MainActivity.class