Added functionality for tariff import from an uploaded file
Merge branch 'origin/arrs_editor_20140426_vc'