changed some layouts
Mon 6:40
Merge branch 'master' of https://github.com/kristitausk/FaceChase-Project

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/FaceChase-Project.apk
	bin/classes.dex
	bin/classes/com/example/facechase_project/MainCameraActivity.class
	bin/classes/com/example/facechase_project/OptionsActivity.class
	bin/classes/com/example/facechase_project/RegistrationActivity.class
	bin/classes/com/example/facechase_project/RegistrationAddTargetsInstructionActivity.class
	bin/classes/com/example/facechase_project/RegistrationPictureInstructionActivity.class
	bin/classes/com/example/facechase_project/RegistrationTakePictureActivity.class
	bin/classes/com/example/facechase_project/TagTargetActivity.class
	bin/classes/com/example/facechase_project/TargetsActivity.class
	bin/resources.ap_
	src/com/example/facechase_project/MainActivity.java
	src/com/example/facechase_project/MainCameraActivity.java
	src/com/example/facechase_project/RegistrationPictureInstructionActivity.java