Merged with the branch and addded my debugging code into CameraView.java
Merge branch 'master' of https://github.com/AVATAR-PANIC/AVATAR-PANIC.git
See previous commit message.