corr
Merge branch 'master' of git://github.com/bit4bit/simplecos
corr
Merge branch 'master' of git://github.com/bit4bit/simplecos
corr
Merge branch 'master' of git://github.com/bit4bit/simplecos
Merge branch 'master' of git://github.com/bit4bit/simplecos

Conflicts:
	app/views/client_cashes/index.html.erb
Merge branch 'master' of git://github.com/bit4bit/simplecos
Merge branch 'master' of git://github.com/bit4bit/simplecos
Merge branch 'master' of git://github.com/bit4bit/simplecos
cambios
accountcode para client
corr
sip profile
removido campo freeswitch_id de public_carriers
trunks para public_carriers utiliza distributor
doc
traducido parcialmente
sip_clients para multiples cuentas sip por cliente
separa cuentas sip de cliente