publics controller merge fix
publics controller merge fix

Muhannes/diaspora,despora/diaspora,spixi/diaspora,diaspora/diaspora,KentShikama/diaspora,Flaburgan/diaspora,despora/diaspora,SuperTux88/diaspora,Flaburgan/diaspora,SuperTux88/diaspora,Amadren/diaspora,spixi/diaspora,geraspora/diaspora,Flaburgan/diaspora,diaspora/diaspora,Flaburgan/diaspora,KentShikama/diaspora,diaspora/diaspora,Muhannes/diaspora,Amadren/diaspora,despora/diaspora,SuperTux88/diaspora,jhass/diaspora,geraspora/diaspora,spixi/diaspora,KentShikama/diaspora,jhass/diaspora,geraspora/diaspora,SuperTux88/diaspora,spixi/diaspora,Muhannes/diaspora,Muhannes/diaspora,KentShikama/diaspora,despora/diaspora,Amadren/diaspora,Amadren/diaspora,diaspora/diaspora,jhass/diaspora,jhass/diaspora,geraspora/diaspora