presprint3
Merge remote-tracking branch 'origin/presprint3' into merged_ui_and_process

Conflicts:
	app/src/main/java/cis642/aphidcounter/CapturePhoto.java
	app/src/main/java/cis642/aphidcounter/TakePhotos.java
merging sprint2changes and master
Merge branch 'merged_ui_and_process'