Fixed scaffolding and routes conflict #669
Fixed scaffolding and routes conflict #669

git-svn-id: afc9fed30c1a09d8801d1e4fbe6e01c29c67d11f@693 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

fabianoleittes/rails,Stellenticket/rails,notapatch/rails,alecspopa/rails,kachick/rails,assain/rails,odedniv/rails,ledestin/rails,kmayer/rails,utilum/rails,xlymian/rails,kaspth/rails,rossta/rails,illacceptanything/illacceptanything,sergey-alekseev/rails,baerjam/rails,rafaelfranca/omg-rails,kddeisz/rails,yalab/rails,stefanmb/rails,starknx/rails,MSP-Greg/rails,riseshia/railsguides.kr,yhirano55/rails,travisofthenorth/rails,tijwelch/rails,rbhitchcock/rails,MichaelSp/rails,notapatch/rails,koic/rails,arunagw/rails,illacceptanything/illacceptanything,printercu/rails,arunagw/rails,kachick/rails,vipulnsward/rails,bogdanvlviv/rails,prathamesh-sonpatki/rails,rails/rails,matrinox/rails,illacceptanything/illacceptanything,eileencodes/rails,flanger001/rails,palkan/rails,illacceptanything/illacceptanything,baerjam/rails,mechanicles/rails,schuetzm/rails,sergey-alekseev/rails,georgeclaghorn/rails,yahonda/rails,tjschuck/rails,samphilipd/rails,lcreid/rails,ngpestelos/rails,utilum/rails,yahonda/rails,yasslab/railsguides.jp,aditya-kapoor/rails,mathieujobin/reduced-rails-for-travis,aditya-kapoor/rails,notapatch/rails,kddeisz/rails,shioyama/rails,arjes/rails,tjschuck/rails,yalab/rails,elfassy/rails,deraru/rails,kaspth/rails,betesh/rails,BlakeWilliams/rails,gfvcastro/rails,Sen-Zhang/rails,gauravtiwari/rails,illacceptanything/illacceptanything,hanystudy/rails,bolek/rails,iainbeeston/rails,georgeclaghorn/rails,Vasfed/rails,richseviora/rails,pvalena/rails,baerjam/rails,repinel/rails,eileencodes/rails,kirs/rails-1,elfassy/rails,lcreid/rails,utilum/rails,shioyama/rails,marklocklear/rails,MichaelSp/rails,Envek/rails,fabianoleittes/rails,flanger001/rails,Erol/rails,printercu/rails,marklocklear/rails,EmmaB/rails-1,Erol/rails,gfvcastro/rails,BlakeWilliams/rails,felipecvo/rails,kenta-s/rails,schuetzm/rails,eileencodes/rails,aditya-kapoor/rails,repinel/rails,EmmaB/rails-1,maicher/rails,esparta/rails,yalab/rails,illacceptanything/illacceptanything,Spin42/rails,arjes/rails,88rabbit/newRails,yahonda/rails,hanystudy/rails,rbhitchcock/rails,ngpestelos/rails,gfvcastro/rails,vipulnsward/rails,kddeisz/rails,tijwelch/rails,mijoharas/rails,voray/rails,mijoharas/rails,joonyou/rails,pvalena/rails,rails/rails,gauravtiwari/rails,brchristian/rails,Spin42/rails,lucasmazza/rails,untidy-hair/rails,bradleypriest/rails,Erol/rails,iainbeeston/rails,Vasfed/rails,sealocal/rails,repinel/rails,printercu/rails,kddeisz/rails,samphilipd/rails,rafaelfranca/omg-rails,ttanimichi/rails,baerjam/rails,travisofthenorth/rails,jeremy/rails,joonyou/rails,yalab/rails,ngpestelos/rails,kenta-s/rails,arjes/rails,Sen-Zhang/rails,ledestin/rails,shioyama/rails,betesh/rails,esparta/rails,kamipo/rails,marklocklear/rails,tgxworld/rails,vassilevsky/rails,mijoharas/rails,sergey-alekseev/rails,Edouard-chin/rails,illacceptanything/illacceptanything,illacceptanything/illacceptanything,georgeclaghorn/rails,pschambacher/rails,gavingmiller/rails,Envek/rails,mechanicles/rails,coreyward/rails,bolek/rails,gavingmiller/rails,rossta/rails,felipecvo/rails,bogdanvlviv/rails,prathamesh-sonpatki/rails,illacceptanything/illacceptanything,iainbeeston/rails,lucasmazza/rails,pvalena/rails,kachick/rails,illacceptanything/illacceptanything,mtsmfm/rails,hanystudy/rails,gcourtemanche/rails,esparta/rails,kmcphillips/rails,MSP-Greg/rails,vipulnsward/rails,joonyou/rails,ledestin/rails,repinel/rails,Stellenticket/rails,kamipo/rails,rails/rails,mohitnatoo/rails,printercu/rails,pvalena/rails,odedniv/rails,palkan/rails,tjschuck/rails,jeremy/rails,Envek/rails,prathamesh-sonpatki/rails,vassilevsky/rails,assain/rails,MSP-Greg/rails,illacceptanything/illacceptanything,odedniv/rails,Vasfed/rails,riseshia/railsguides.kr,alecspopa/rails,samphilipd/rails,rbhitchcock/rails,palkan/rails,yhirano55/rails,Edouard-chin/rails,yawboakye/rails,shioyama/rails,BlakeWilliams/rails,schuetzm/rails,illacceptanything/illacceptanything,sealocal/rails,mohitnatoo/rails,MSP-Greg/rails,deraru/rails,illacceptanything/illacceptanything,aditya-kapoor/rails,Edouard-chin/rails,mechanicles/rails,yhirano55/rails,sealocal/rails,yawboakye/rails,mtsmfm/railstest,mathieujobin/reduced-rails-for-travis,yawboakye/rails,yhirano55/rails,eileencodes/rails,kirs/rails-1,kmcphillips/rails,joonyou/rails,xlymian/rails,starknx/rails,Stellenticket/rails,ttanimichi/rails,coreyward/rails,xlymian/rails,georgeclaghorn/rails,rafaelfranca/omg-rails,amoody2108/TechForJustice,alecspopa/rails,illacceptanything/illacceptanything,lucasmazza/rails,bogdanvlviv/rails,mathieujobin/reduced-rails-for-travis,mechanicles/rails,lcreid/rails,palkan/rails,lcreid/rails,stefanmb/rails,rails/rails,utilum/rails,bogdanvlviv/rails,untidy-hair/rails,88rabbit/newRails,Erol/rails,gcourtemanche/rails,88rabbit/newRails,mtsmfm/rails,coreyward/rails,tgxworld/rails,amoody2108/TechForJustice,koic/rails,Stellenticket/rails,starknx/rails,brchristian/rails,iainbeeston/rails,fabianoleittes/rails,untidy-hair/rails,MichaelSp/rails,mtsmfm/railstest,riseshia/railsguides.kr,kamipo/rails,assain/rails,jeremy/rails,richseviora/rails,brchristian/rails,tjschuck/rails,bradleypriest/rails,rossta/rails,Envek/rails,kmcphillips/rails,matrinox/rails,betesh/rails,Vasfed/rails,mohitnatoo/rails,yasslab/railsguides.jp,riseshia/railsguides.kr,amoody2108/TechForJustice,notapatch/rails,arunagw/rails,esparta/rails,mtsmfm/railstest,vassilevsky/rails,illacceptanything/illacceptanything,Spin42/rails,EmmaB/rails-1,kirs/rails-1,deraru/rails,richseviora/rails,jeremy/rails,tijwelch/rails,vipulnsward/rails,tgxworld/rails,arunagw/rails,bolek/rails,Edouard-chin/rails,maicher/rails,flanger001/rails,prathamesh-sonpatki/rails,BlakeWilliams/rails,felipecvo/rails,assain/rails,fabianoleittes/rails,Sen-Zhang/rails,bradleypriest/rails,travisofthenorth/rails,untidy-hair/rails,tgxworld/rails,schuetzm/rails,maicher/rails,voray/rails,kmayer/rails,yasslab/railsguides.jp,kmayer/rails,yasslab/railsguides.jp,travisofthenorth/rails,yawboakye/rails,stefanmb/rails,ttanimichi/rails,mtsmfm/rails,matrinox/rails,gavingmiller/rails,elfassy/rails,betesh/rails,flanger001/rails,voray/rails,kmcphillips/rails,pschambacher/rails,kaspth/rails,gcourtemanche/rails,gfvcastro/rails,kenta-s/rails,yahonda/rails,mohitnatoo/rails,deraru/rails,pschambacher/rails,gauravtiwari/rails,koic/rails