Android studio project to master merge

Please review it
xml id should be renamed to first_edit_text as well.