App::import to App::uses
Merge pull request #1677 from dereuromark/master-cleanup

App::import to App::uses