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 'master' of https://github.com/milneti/PayBack