upgrade project to android studio
fix conflicts