added changes sent by jacob, now using the intended ui, i think, started working on saving stuff in a local db so it doesn't reset when app shutds down
working save field in database.
working add/view fields.
Merge pull request #6 from CIS642/running_UI

Running ui - merged for release
Merge remote-tracking branch 'origin/staton'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/cis642/aphidcounter/AboutScreen.java
	app/src/main/java/cis642/aphidcounter/HelpScreen.java
	app/src/main/java/cis642/aphidcounter/InstructionScreen.java
	app/src/main/java/cis642/aphidcounter/MainActivity.java
	app/src/main/java/cis642/aphidcounter/MyActivity.java
	app/src/main/java/cis642/aphidcounter/entity/Field.java
	app/src/main/java/cis642/aphidcounter/storage/AddField.java
	app/src/main/java/cis642/aphidcounter/storage/SelectField.java
	app/src/main/res/layout/activity_my.xml
	app/src/main/res/layout/select_field_layout.xml
	libraries/opencv/build/intermediates/bundles/release/classes.jar
	libraries/opencv/build/outputs/aar/opencv.aar
release 4
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