User Profile changes
Merge branch 'angular' of https://github.com/dshurt/Open-Storefront into angular

Conflicts:
	site/index.html