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 'Huys_Branch'
Merge branch 'WillsBranch'
Merge branch 'master' of https://github.com/milneti/PayBack
Working on trans 2
User Stuff

Gave the User class two constructors; one for new users, one for
existing users.
Merge branch 'master' into WillsBranch