Cleaned project and changed MainActivity to match updated GCMServerTest