Merge branch 'master' of ssh://dailydo-petertang.rhcloud.com/~/git/dailydo

Add openshift deploy
Rebase project from openshift pull request