Merge branch 'master' of https://github.com/CrowdStory/CrowdStory

Signed-off-by: Stefanie Taepke <s.taepke@student.HTW-Berlin.de>
Merge branch 'master' of https://github.com/CrowdStory/CrowdStory