Fix Reset command
Fix conflicts
Merge branch 'master' of https://github.com/cgrates/cgrates
Merge branch 'master' of https://github.com/cgrates/cgrates
Merge branch 'master' of https://github.com/cgrates/cgrates
Merge branch 'master' of https://github.com/cgrates/cgrates
Fix cdrstats api
Merge branch 'master' of https://github.com/cgrates/cgrates
Merge branch 'master' of https://github.com/cgrates/cgrates
Merge branch 'master' of https://github.com/cgrates/cgrates
Merge branch 'master' of https://github.com/cgrates/cgrates
Merge branch 'master' of https://github.com/cgrates/cgrates
Merge branch 'master' of https://github.com/cgrates/cgrates