Fix merge conflict.
Fix merge conflict.

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