Updated Camera Feature - 1025 : update 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/xzbkcc/bullseye1/RegisterPhoneNo.java
	app/src/main/res/values/strings.xml