Fix merge conflict in Gemfile.
Fix merge conflict in Gemfile.

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