Merge openshift/cakephp-example and hugodias/cakestrap. CakePHP 2.2