Design

Partly reverted

Signed-off-by: Stefanie Taepke <s.taepke@student.HTW-Berlin.de>
dummy-data

not finished yet

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

Signed-off-by: Stefanie Taepke <s.taepke@student.HTW-Berlin.de>

Conflicts:
	grails-app/controllers/de/htw/crowdStory/StoryController.groovy
Merke mit aktuellen Status

hopefully there are no changes from me anymore

Signed-off-by: Stefanie Taepke <s.taepke@student.HTW-Berlin.de>