rubbish cleaned
temp hgack
Merge branch 'master' of https://github.com/ihorman/openshift-jelastic-jboss7