Added Upload Activity/ Removed Async and GCM Activity