Adam's push work
Merge branch 'master' of https://github.com/jacobhanshaw/Sniper

Conflicts:
	android/AndroidManifest.xml
	android/bin/AndroidManifest.xml
	android/src/com/sniper/core/Camera.java