usxxxx - idp updates
Merge branch '2014.2-usxxx-idp-updates'

Conflicts:
	app/partials/phone-detail.html