Maus und Useranzeige

Change-Id: I4ab2df5c4a1741a9de246e812bc1f596e25b30cf
Signed-off-by: nicma <studium@nmarin.de>
Merge branch 'master' of https://github.com/topahl/StoryBear.git