commit
Merge branch 'master' of github.com:tavu/autobahn-android

Conflicts:
	src/autobahn/android/AutobahnClient.java