Fix merge conflict.
Fix merge conflict.

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