Merge branch 'master' into Huys_Branch
Merge remote-tracking branch 'origin/master' into Huys_Branch
cleaned up some code

I just renamed  and reordered some code to clean it up. also added some
string resources to replace some hardcoded strings.
Merge branch 'master' into WillsBranch
Merge branch 'Huys_Branch'
Made User Class Nice and Pretty
Merge branch 'WillsBranch'
Working on Trans 2
Merge branch 'master' of https://github.com/milneti/PayBack
Merge branch 'master' into Huys_Branch

Conflicts:
	PayBack/src/com/example/payback/User.java
Working on trans 2
Merge branch 'master' into Huys_Branch

Conflicts:
	PayBack/src/com/example/payback/User.java
User Stuff

Gave the User class two constructors; one for new users, one for
existing users.
working on trans 2

added a way of selecting v01
finished adding a basic contact selection

transaction page 2 can now add contacts. I haven't implemented the
friend list but if you go through, it's really easy to add new contacts
to the list. it can probably be added with a forloop once we finish the
user class a bit more
Merge branch 'Huys_Branch'
Merge branch 'master' into Huys_Branch
contact page sequence updates
Merge remote-tracking branch 'origin/master' into T-Branch

Conflicts:
	PayBack/res/values/strings.xml
trying to overhaul from checkbox to expandable list for future use