Merge pull request #515 from Jedwondle/v1.2

Just getting some user profile too changes merged in.
STORE-301	Admin - Users Profiles
Merge branch 'v1.2' of https://github.com/di2e/openstorefront into v1.2
Merge pull request #516 from dshurt/v1.2

STORE-301	Admin - Users Profiles
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