asdf

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
Merge branch 'master' of https://github.com/Nepetalactone/AvalancheWarning

Conflicts:
	AvalancheWarning/bin/classes.dex
	AvalancheWarning/src/fh/itb/avalanchewarning/ListenThread.java
	AvalancheWarningServer/src/Server/ClientConnection.java
Photo funktioniert

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>