Profile receives correct values
Manual merge with Aaron's game changes
Merge remote-tracking branch 'nlay/master'