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.
Eradicated userIds from Frontend

I only modified the User class, Transaction may still need some work.
Merge branch 'master' into WillsBranch
Merge branch 'Huys_Branch'
Made User Class Nice and Pretty
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.
contact page sequence updates
Merge remote-tracking branch 'origin/master' into T-Branch

Conflicts:
	PayBack/res/values/strings.xml