Merge branch 'web-server' into 'master'

app/build.gradle

app/src/main/AndroidManifest.xml

...c/main/java/org/briarproject/hotspot/HotspotFragment.java

app/src/main/java/org/briarproject/hotspot/MainActivity.java

...src/main/java/org/briarproject/hotspot/MainViewModel.java

...rc/main/java/org/briarproject/hotspot/ServerFragment.java

app/src/main/java/org/briarproject/hotspot/StringUtils.java

app/src/main/java/org/briarproject/hotspot/WebServer.java

app/src/main/res/layout/activity_main.xml

app/src/main/res/layout/fragment_hotspot.xml

app/src/main/res/layout/fragment_server.xml

app/src/main/res/values/strings.xml

gradle.properties