Initial commit of settings menu work
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/intermediates/dex/debug/classes.dex
	app/build/intermediates/res/resources-debug.ap_
	app/build/outputs/apk/app-debug-unaligned.apk
	app/build/outputs/apk/app-debug.apk
	app/src/main/AndroidManifest.xml
Settings menu is up and running for username and password. The values
are stored in persistent storage.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/generated/source/r/debug/com/patchx/umbcringer/R.java
	build/intermediates/model_data.bin