Merge branch 'master' into Phils-Development
UI buttons now init with right data
Merge branch 'Phils-Development'