Changes to add customer-service association functionality
Merge branch 'origin/arrs_edit_tariff_IM'

The changes from origin/arrs_edit_tariff_IM were merged because merging origin/arrs_editor_20140313_vc into development had conflict issues that could not be spotted using the git tools.