Update AR-import
Merge branch 'master' into quick-entry
Rename quick_entry controller to quick_entries and likewise the functional test, log referrer