sprint 5
partial merging
Merge branch 'master' into master+sprint5

Conflicts:
	app/src/main/java/cis642/aphidcounter/activity/MyActivity.java
	app/src/main/java/cis642/aphidcounter/activity/TakePhotos.java
	app/src/main/java/cis642/aphidcounter/entity/Field.java
	app/src/main/java/cis642/aphidcounter/storage/SelectField.java
	app/src/main/res/layout/select_field_layout.xml
	libraries/opencv/build/generated/source/aidl/release/org/opencv/engine/OpenCVEngineInterface.java
	libraries/opencv/build/intermediates/bundles/release/res/values/values.xml
	libraries/opencv/build/intermediates/incremental/aidl/release/dependency.store
	libraries/opencv/build/intermediates/incremental/mergeAssets/release/merger.xml
	libraries/opencv/build/intermediates/incremental/packageResources/release/merger.xml
take photo now populates spinner with available fields. Cant get pass the picture part though... it's not working in the emulator and i cant test it in my phone.
final tweaks to make things work.
Merge pull request #9 from CIS642/master+sprint5

Updating master for changes