In middle of password change dialog.  Need to pull Kevin's dev changes.
Merge branch 'dev' of https://github.com/nysenate/InventoryMobileApp.git
into dev

Conflicts:
	res/values/strings.xml
Refinement of Change Password Dialog to work both when user changes
password on login as well as when the user clicks to change password.
Re-Organized the imports.
Change Password now captures failure due to Password Policy Rules. Refs
#7547