Fixed merging bug
Fixed merging bug

ronanchilvers/PHPCI,seshurajup/PHPCI,chtombleson/PHPCI,steverobbins/PHPCI,Coderockr/PHPCI,nelsonyang0710/PHPCI,mikebronner/PHPCI,mehulsbhatt/PHPCI,keradus/PHPCI,mikebronner/PHPCI,onedal88/PHPCI,Block8/PHPCI,ojengwa/PHPCI,ronanchilvers/PHPCI,onedal88/PHPCI,mehulsbhatt/PHPCI,zilionis/PHPCI,tankist/PHPCI,mavimo/PHPCI,Lechus/PHPCI,mindteam/PHPCI,mikk150/PHPCI,dwolke/phpci,rafaelang/PHPCI,mehulsbhatt/PHPCI,wodka/PHPCI,corretgecom/PHPCI,corretgecom/PHPCI,Adirelle/PHPCI,andreustimm/PHPCI,Block8/PHPCI,mseshachalam/PHPCI,seshurajup/PHPCI,juanf/PHPCI,leadermt/PHPCI,zilionis/PHPCI,Adirelle/PHPCI,dwolke/phpci,wodka/PHPCI,Topface/PHPCI,php-censor/php-censor,SamMousa/PHPCI,SamMousa/PHPCI,Topface/PHPCI,nelsonyang0710/PHPCI,mavimo/PHPCI,mikebronner/PHPCI,nevernet/PHPCI,Coderockr/PHPCI,mikk150/PHPCI,andreustimm/PHPCI,gdseller/PHPCI,rafaelang/PHPCI,cooperaj/PHPCI,Adirelle/PHPCI,mikk150/PHPCI,ojengwa/PHPCI,steverobbins/PHPCI,gdseller/PHPCI,cooperaj/PHPCI,LewisW/PHPCI,gdseller/PHPCI,leadermt/PHPCI,LewisW/PHPCI,php-censor/php-censor,Lechus/PHPCI,nevernet/PHPCI,cooperaj/PHPCI,mindteam/PHPCI,keradus/PHPCI,Topface/PHPCI,Coderockr/PHPCI,seshurajup/PHPCI,andreustimm/PHPCI,ojengwa/PHPCI,ronanchilvers/PHPCI,corpsee/php-censor,corpsee/php-censor,Block8/PHPCI,onedal88/PHPCI,mseshachalam/PHPCI,laszlof/PHPCI,Lechus/PHPCI,leadermt/PHPCI,jimmycleuren/PHPCI,nevernet/PHPCI,corpsee/php-censor,laszlof/PHPCI,ronanchilvers/PHPCI,zilionis/PHPCI,chtombleson/PHPCI,jimmycleuren/PHPCI,mindteam/PHPCI,nelsonyang0710/PHPCI,jimmycleuren/PHPCI,LewisW/PHPCI,steverobbins/PHPCI,corretgecom/PHPCI,mseshachalam/PHPCI,mavimo/PHPCI,rafaelang/PHPCI,juanf/PHPCI,php-censor/php-censor,SamMousa/PHPCI,tankist/PHPCI,chtombleson/PHPCI,laszlof/PHPCI,juanf/PHPCI,keradus/PHPCI,tankist/PHPCI,dwolke/phpci