initial commit
Merge branch 'public2'

Conflicts:
	src/co/fabway/websockettest/MainActivity.java
reintroduced stuff I removed in the other branch