sdgfsd

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

Conflicts:
	AvalancheWarning/bin/classes.dex
	AvalancheWarning/bin/classes/fh/itb/avalanchewarning/LoginActivity.class
	AvalancheWarning/bin/resources.ap_
Feddisch

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