Merge pull request #20 from baasbox/master

update from origin
fixed #303 - baasbox on openshift error 503
Merge pull request #304 from giastfader/master

fixed #303 - baasbox on openshift error 503