Commit after Camera Window
Merge branch 'master' of https://github.com/bodhisattwadas/AndroidApplicationCarLypso

Conflicts:
	bin/CarLypso.apk
	bin/classes/com/example/carlypso/Camera.class
	bin/classes/com/example/carlypso/DescriptionActivity.class
	bin/classes/com/example/carlypso/EnterVinActivity.class
	bin/classes/com/example/carlypso/ExtShotActivity.class
	bin/classes/com/example/carlypso/MainActivity.class
	bin/classes/com/example/carlypso/R$drawable.class
	bin/classes/com/example/carlypso/R$id.class
	bin/dexedLibs/android-support-v4-7d23729b0eee9720d936a1a7303edff9.jar
	bin/resources.ap_
	gen/com/example/carlypso/R.java
	res/layout/activity_camera.xml
	src/com/example/carlypso/Camera.java