photodetails stuffs
Merge branch 'master' of https://github.com/congchen5/photofocus

Conflicts:
	app/bin/PhotoFocus.apk
	app/bin/R.txt
	app/bin/classes.dex
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/PhotoSession.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/PhotoSessionComplete.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$id.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$layout.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$menu.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$string.class
	app/bin/classes/edu/berkeley/cs160/stackunderflow/photofocus/R$style.class
	app/bin/resources.ap_
	app/gen/edu/berkeley/cs160/stackunderflow/photofocus/R.java