Revert "Revert "Revert "Update 1"""

This reverts commit 48e9d65322848eaaaf41bfb07f1c896bf9fa6cf9.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/intermediates/manifests/debug/AndroidManifest.xml
	app/build/intermediates/res/debug/layout/activity_register_phone_no.xml
	app/build/intermediates/res/debug/layout/activity_term_cond.xml
	app/build/intermediates/res/debug/menu/register_phone_no.xml
	app/build/intermediates/res/debug/menu/term_cond.xml