remove unused imports
optimize imports
Merge branch 'master' into refactor_detailsactivity