Truncated history
test commit after truncated history
Merge branch 'public2' into public

Conflicts:
	src/co/fabway/websockettest/MainActivity.java