usxxxxx - site updates
Merge branch '2014.1-usxxxx-site-refresh'

Conflicts:
	app/partials/phone-detail.html