Merge pull request #487 from leider/master

layout changes for multiple resources in activities
fixed UI for phones in activity edit
notifications don’t have to be printed
Merge commit '27c29185838d56c4c715475ba6f8e70c28040456'

# Via Andreas Leidig
* commit '27c29185838d56c4c715475ba6f8e70c28040456':