resolve duplicate import in gradle & update dependencies
listen to lint-- update some Java and clean-up some layout & strings