updates
updates merge

Conflicts:
	com.PrepaidAccountCenter/Home.storyboard
	com.PrepaidAccountCenter/ManageUserCredentials.m
	com.PrepaidAccountCenter/Terms.m
	com.PrepaidAccountCenter/Terms.xib
	com.PrepaidAccountCenter/VCHome.m