Android studio project to master merge

Please review it
Can remove, redundant line