Adding Layout For Main EditText Page
Merge branch 'master' into POSlayout

Conflicts:
	app/src/main/res/values/strings.xml