xml
Merge branch 'master' of https://github.com/AVATAR-PANIC/AVATAR-PANIC.git
all the layouts doneee
sfd
Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git

Conflicts:
	AVATAR working copy/project.properties
removed some pointless stuff
Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git

Conflicts:
	AVATAR working copy/res/layout/camera_view.xml
BOOM renamed these layouts
Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git

Conflicts:
	AVATAR working
copy/src/sate2012/avatar/android/augmentedrealityview/CameraView.java