Fix merge error: Now the authentication system works again!
Fix merge error: Now the authentication system works again!

johanb/refinerycms,mkaplan9/refinerycms,mabras/refinerycms,trevornez/refinerycms,Retimont/refinerycms,Eric-Guo/refinerycms,bricesanchez/refinerycms,gwagener/refinerycms,simi/refinerycms,clanplaid/wow.clanplaid.net,pcantrell/refinerycms,donabrams/refinerycms,kappiah/refinerycms,johanb/refinerycms,gwagener/refinerycms,louim/refinerycms,trevornez/refinerycms,stakes/refinerycms,sideci-sample/sideci-sample-refinerycms,mojarra/myrefinerycms,bryanmtl/g-refinerycms,aguzubiaga/refinerycms,kelkoo-services/refinerycms,refinery/refinerycms,KingLemuel/refinerycms,koa/refinerycms,Retimont/refinerycms,kappiah/refinerycms,mobilityhouse/refinerycms,bryanmtl/g-refinerycms,bricesanchez/refinerycms,hoopla-software/refinerycms,clanplaid/wow.clanplaid.net,stefanspicer/refinerycms,gwagener/refinerycms,SmartMedia/refinerycms-with-custom-icons,Retimont/refinerycms,mojarra/myrefinerycms,Eric-Guo/refinerycms,anitagraham/refinerycms,simi/refinerycms,koa/refinerycms,Eric-Guo/refinerycms,stefanspicer/refinerycms,LytayTOUCH/refinerycms,refinery/refinerycms,kelkoo-services/refinerycms,SmartMedia/refinerycms-with-custom-icons,anitagraham/refinerycms,simi/refinerycms,aguzubiaga/refinerycms,sideci-sample/sideci-sample-refinerycms,aguzubiaga/refinerycms,anitagraham/refinerycms,mlinfoot/refinerycms,refinery/refinerycms,mlinfoot/refinerycms,chrise86/refinerycms,mkaplan9/refinerycms,chrise86/refinerycms,simi/refinerycms,mkaplan9/refinerycms,LytayTOUCH/refinerycms,LytayTOUCH/refinerycms,trevornez/refinerycms,chrise86/refinerycms,mobilityhouse/refinerycms,stakes/refinerycms,kappiah/refinerycms,hoopla-software/refinerycms,mabras/refinerycms,louim/refinerycms,johanb/refinerycms,KingLemuel/refinerycms,KingLemuel/refinerycms,mlinfoot/refinerycms,hoopla-software/refinerycms,donabrams/refinerycms,stefanspicer/refinerycms,pcantrell/refinerycms,mabras/refinerycms