Merged cakeStrap

Merged hugodias/cakeStrap with openshift/cakephp-example