Fix import CDR with Postgresql
Merge branch 'develop' into billing