communication almost complete

WAR client -> raydotcom -> WAR server

Aayusin pa yung WAR server pabalik WAR client via GCM
fixed conflict on SettingsActivity.java