Changes to get the user profile admin tool working.
Merge branch 'v1.2' of https://github.com/di2e/openstorefront into v1.2

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/UserProfileView.java
Merge branch 'v1.2' of https://github.com/di2e/openstorefront into v1.2
Got the user edit started for admin user profile tool.
Merge pull request #518 from Jedwondle/v1.2

Got the user edit started for the admin user profile tool.