usxxx-add back button to idp
Merge branch '2014.A-usxxx-first-Story'

Conflicts:
	app/partials/phone-detail.html