temp
Revert "temp"

This reverts commit 1a3034f2735636a6d85dad5fdab104b18ced6975.
Revert "Revert "temp""

This reverts commit 3edc5b48dec9aecf732493dc8628430152c0b3ce.
Revert "temp"

This reverts commit 1a3034f2735636a6d85dad5fdab104b18ced6975.
Merge branch 'master' of https://github.com/fabiogermann/zhaw-zufa