Sortierung und so...

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