Android studio project to master merge

Please review it
rename to ```firstEditText```