staton changes
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