Brought the folders app and skel back in sync again

Also adresses https://github.com/cakephp/cakephp/commit/1c6a379346918a9ca350a12609bee4e7b8342a01#commitcomment-4231123