fix the icon generation for newer version of the favicon_maker extension
fix the icon generation for newer version of the favicon_maker extension

Conflicts:
	config.rb

shishir-a412ed/atomic-site,mrjoshuap/atomic-site,OSAS/middleman-planet,jtokar/ovirt-site,PeterDaveHello/glusterweb,gluster/glusterweb,coolsvap/website,hguemar/website,fmpwizard/atomic-site,rafaelmartins/ovirt-site,OSAS/middleman-planet,SaravanaStorageNetwork/glusterweb,fmpwizard/atomic-site,dwlehman/blivet-web,weshayutin/website,dtantsur/website,anoopcs9/glusterweb,mscherer/glusterweb,mscherer/glusterweb,sachidanandaurs/planet-gluster,aweiteka/atomic-site,kshlm/glusterweb,yazug/rdo-website,nzwulfin/atomic-site,dtantsur/website,jtokar/ovirt-site,TomasTomecek/atomic-site,wking/atomic-site,sachidanandaurs/planet-gluster,PeterDaveHello/glusterweb,thatdocslady/ovirt-site,pwnall/atomic-site,nzwulfin/atomic-site,jtokar/ovirt-site,weshayutin/website,coolsvap/website,ManageIQ/planet.manageiq.org,aweiteka/atomic-site,gluster/glusterweb,bexelbie/atomic-site,ManageIQ/planet.manageiq.org,mscherer/glusterweb,subecho/website,rafaelmartins/ovirt-site,mrjoshuap/atomic-site,goern/atomic-site,cdrage/atomic-site,wking/atomic-site,gluster/glusterweb,jtokar/ovirt-site,aweiteka/atomic-site,goern/atomic-site,yazug/rdo-website,AsherBond/gluster-site,coolsvap/website,thatdocslady/ovirt-site,jasonbrooks/ovirt-stg,OSAS/middleman-planet,sachidanandaurs/planet-gluster,fmpwizard/atomic-site,vaneldik/website,weshayutin/website,nzwulfin/atomic-site,kshlm/glusterweb,bexelbie/atomic-site,wking/atomic-site,anoopcs9/glusterweb,vaneldik/website,msvbhat/planet-gluster,kshlm/glusterweb,pwnall/atomic-site,aweiteka/atomic-site,shishir-a412ed/atomic-site,nzwulfin/atomic-site,hguemar/website,ManageIQ/planet.manageiq.org,msvbhat/planet-gluster,wking/atomic-site,cdrage/atomic-site,dtantsur/website,jasonbrooks/ovirt-stg,subecho/website,bexelbie/atomic-site,dtantsur/website,TomasTomecek/atomic-site,dwlehman/blivet-web,dwlehman/blivet-web,kshlm/glusterweb,bexelbie/atomic-site,apevec/website,jasonbrooks/ovirt-stg,yazug/rdo-website,anoopcs9/glusterweb,apevec/website,sachidanandaurs/planet-gluster,SaravanaStorageNetwork/glusterweb,ManageIQ/planet.manageiq.org,PeterDaveHello/glusterweb,mscherer/glusterweb,yazug/rdo-website,goern/atomic-site,apevec/website,hguemar/website,coolsvap/website,vaneldik/website,bexelbie/atomic-site,shishir-a412ed/atomic-site,dwlehman/blivet-web,mrjoshuap/atomic-site,SaravanaStorageNetwork/glusterweb,anoopcs9/glusterweb,hguemar/website,TomasTomecek/atomic-site,subecho/website,gluster/glusterweb,OSAS/middleman-planet,pwnall/atomic-site,cdrage/atomic-site,apevec/website,pwnall/atomic-site,msvbhat/planet-gluster,subecho/website,fmpwizard/atomic-site,PeterDaveHello/glusterweb,rafaelmartins/ovirt-site,cdrage/atomic-site,hguemar/website,thatdocslady/ovirt-site,apevec/website,rafaelmartins/ovirt-site,nzwulfin/atomic-site,mrjoshuap/atomic-site,goern/atomic-site,weshayutin/website,thatdocslady/ovirt-site,SaravanaStorageNetwork/glusterweb,TomasTomecek/atomic-site,weshayutin/website,shishir-a412ed/atomic-site,jasonbrooks/ovirt-stg,AsherBond/gluster-site,msvbhat/planet-gluster,vaneldik/website,AsherBond/gluster-site