changes at BasicActiviy
Merge branch 'master' of github.com:tavu/autobahn-android

Conflicts:
	gen/com/example/autobahn/BuildConfig.java
	src/autobahn/android/BasicActiviy.java