Android studio project to master merge

Please review it
Bad indentation