Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git

Conflicts:
	AVATAR working copy/res/layout/camera_view.xml
Merge branch 'master' of https://github.com/AVATAR-PANIC/AVATAR-PANIC.git
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
vhgdc
Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git
HELP?!?!?!?
A bunch of layout renaming
Here's an update