Removed conflicting image.
Merge branch 'master' of github.com:eschabell/openshift-devoxx