most of code style errors gone
most of code style errors gone

Conflicts:

	install.php

charnimda/lgbtpzn-social,zcopley/StatusNet,faulteh/gnu-social,eXcomm/gnu-social,zcopley/zcopleys-statusnet-clone,chimo/social,UngPirat/freesocial,eXcomm/gnu-social,charlycoste/StatusNet,bankonme/gnu-social,studio666/gnu-social,charlycoste/StatusNet,minmb/statusnet,Piratas/tortuga,shashi/StatusNet,foocorp/gnu-social,bankonme/gnu-social,zh/statusnet,furtherfield/gnu-social,studio666/gnu-social,gnusocial/mainline,znarf/statusnet-ladistribution,brion/StatusNet,studio666/gnu-social,zh/statusnet,charlycoste/StatusNet,zcopley/StatusNet,d3vgru/StatusNet,Piratas/tortuga,gnusocial/mainline,faulteh/gnu-social,UngPirat/freesocial,xebia/statusnet-oauth2,xebia/statusnet-oauth2,furtherfield/gnu-social,shashi/StatusNet,eXcomm/gnu-social,Piratas/tortuga,csarven/statusnet,d3vgru/StatusNet,sikevux/bsk-social,charnimda/lgbtpzn-social,minmb/statusnet,zcopley/StatusNet,furtherfield/gnu-social,sikevux/bsk-social,foocorp/gnu-social,sikevux/bsk-social,xebia/statusnet-oauth2,bankonme/gnu-social,brion/StatusNet,studio666/gnu-social,brion/StatusNet,eXcomm/gnu-social,chimo/social,csarven/statusnet,d3vgru/StatusNet,bankonme/gnu-social,minmb/statusnet,csarven/statusnet,gnusocial/mainline,zcopley/zcopleys-statusnet-clone,chimo/social,sikevux/bsk-social,csarven/statusnet,zcopley/zcopleys-statusnet-clone,furtherfield/gnu-social,foocorp/gnu-social,zh/statusnet,faulteh/gnu-social,UngPirat/freesocial,znarf/statusnet-ladistribution,znarf/statusnet-ladistribution,shashi/StatusNet,gnusocial/mainline,faulteh/gnu-social,charnimda/lgbtpzn-social,Piratas/tortuga