Updated fragment
Merge branch 'master' of https://github.com/AVATAR-PANIC/AVATAR-PANIC.git
Added exit capabilities to the fragment. Also made another package to
hold Google maps stuff if we need one.
Merge branch 'master' of https://github.com/AVATAR-PANIC/AVATAR-PANIC.git
I think this will work... This should make everything better
Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git

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