Fixed merged tables
Fixed charge and fees
Small impovements
Remove datasource references from buildconfig file
Fixed reserved table name and table column
Small improvements in services
Sort services
Fixed error in move table to activities