Botnet_Research/hostage @ b1be8f3985bcb5b5a68916e2980a0a2876dcb0c2

Alexander Brakowski b1be8f3985 Merge branch 'master' into feature_profile_manager_edit		%!s(int64=10) %!d(string=hai) anos
..
preferences.xml	ee92b061bc Moved Strings from MainActivity to ressources	%!s(int64=10) %!d(string=hai) anos
profile_preferences.xml	88f6cf518f initial feature implentation	%!s(int64=10) %!d(string=hai) anos