adding setExtensions() to allow adding more extensions as parseExtensions would override existing valid extensions
adding setExtensions() to allow adding more extensions as parseExtensions would override existing valid extensions

Conflicts:

	lib/Cake/Routing/Router.php

web-player/cakephp,tgr0ss/cakephp,khoimt/cakephp-study,pbaire/cakephp,erikfig/cakephp,garethellis36/cakephp,CakeDC/cakephp,jerems02/cakephp,davidyell/cakephp,burriko/cakephp,Balachan27/cakephp,michaelze/cakephp,timhoeppner/cakephp,cakephp/cakephp,cakephp/cakephp,nrother/cakephp,petteyg/cakephp,web-player/cakephp,CakeDC/cakephp,dakota/cakephp,ionas/cakephp,tgr0ss/cakephp,ionas/cakephp,adopico/cakephp,cakephp/cakephp,Balachan27/cakephp,mvdriel/cakephp,tenkoma/cakephp,berrygoudswaard/cakephp,garethellis36/cakephp,jeffblack360/cakephp,kumamidori/cakephp,akintoey/cakephp,berrygoudswaard/cakephp,elboletaire/cakephp,dakota/cakephp,pbaire/cakephp,CakeDC/cakephp,nrother/cakephp,ndm2/cakephp,bravo-kernel/cakephp,Balachan27/cakephp,gmponos/cakephp,CVO-Technologies/cakephp,Phillaf/cakephp,timhoeppner/cakephp,adopico/cakephp,petteyg/cakephp,michaelze/cakephp,nrother/cakephp,bravo-kernel/cakephp,ADmad/cakephp,elboletaire/cakephp,bravo-kernel/cakephp,mvdriel/cakephp,timhoeppner/cakephp,yinhe007/cakephp,cakephp-fr/cakephp,akintoey/cakephp,dakota/cakephp,khoimt/cakephp-study,jeffblack360/cakephp,kumamidori/cakephp,HavokInspiration/cakephp,eryw/cakephp,elboletaire/cakephp,jjj117/cakephp,yinhe007/cakephp,dakota/cakephp,tisu2tisu/cakephp,erikfig/cakephp,petteyg/cakephp,petteyg/cakephp,erikfig/cakephp,eryw/cakephp,justinyost/cakephp,eboominathan/cakephp,CakeDC/cakephp,davidyell/cakephp,davidyell/cakephp,cakephp/cakephp,ndm2/cakephp,ndm2/cakephp,tgr0ss/cakephp,HavokInspiration/cakephp,cakephp-fr/cakephp,burriko/cakephp,thinkingmedia/cakephp,gmponos/cakephp,jerems02/cakephp,tisu2tisu/cakephp,tenkoma/cakephp,thinkingmedia/cakephp,HavokInspiration/cakephp,tenkoma/cakephp,khoimt/cakephp-study,eryw/cakephp,michaelze/cakephp,eboominathan/cakephp,kumamidori/cakephp,garethellis36/cakephp,CVO-Technologies/cakephp,jeffblack360/cakephp,ADmad/cakephp,Phillaf/cakephp,jjj117/cakephp,ADmad/cakephp,ADmad/cakephp,tisu2tisu/cakephp,burriko/cakephp,justinyost/cakephp,dkarvounaris/cakephp,ionas/cakephp,tenkoma/cakephp,mvdriel/cakephp,jerems02/cakephp,thinkingmedia/cakephp,eboominathan/cakephp,justinyost/cakephp,cakephp-fr/cakephp,berrygoudswaard/cakephp,adopico/cakephp,akintoey/cakephp,pbaire/cakephp,CVO-Technologies/cakephp,gmponos/cakephp,Phillaf/cakephp,yinhe007/cakephp,ndm2/cakephp,dkarvounaris/cakephp,mvdriel/cakephp,web-player/cakephp,dkarvounaris/cakephp,garethellis36/cakephp,jjj117/cakephp