we openshift now
I totally just fucked it up :D
Merge pull request #1 from sdierauf/feature/stefans-branch

Feature/stefans branch