Fixed GPG so it works, but still alot of crashses
Minor merge fixes in GameActivity