Merge pull request #46 from milneti/master

Update Local Branch
Merge pull request #57 from milneti/master

Local Branch Update
temp push
+server delete contact
Pull into T-Branch

	new file:   PayBack/res/layout/activity_resolve_transaction1.xml
	modified:   PayBack/res/values/strings.xml
	new file:   PayBack/src/com/example/payback/ResolveTransaction.java
	modified:   PayBack/src/com/example/payback/ResolveTransactionActivity.java
	modified:   PayBack/src/com/example/payback/User.java
Merge pull request #58 from milneti/T-Branch

T branch