jan 21 728pm

back up lang baka sumabog laptop ko eh
communication almost complete

WAR client -> raydotcom -> WAR server

Aayusin pa yung WAR server pabalik WAR client via GCM
Database adjustments
Database adjustments
Database adjustments
fixed conflict on SettingsActivity.java
sumasabog sa hibernate
Merge branch 'LINEDRIVE' of github.com:smitparaggua/thesis-clean into TRIPLESLASH

Signed-off-by: John Smith Paraggua <smitparaggua@gmail.com>

Conflicts:
	raydotcom/src/main/java/com/csg/warrior/raydotcom/WarriorConfig.java
	raydotcom/src/main/java/com/csg/warrior/raydotcom/service/WarriorService.java
	raydotcom/src/main/java/com/csg/warrior/raydotcom/service/impl/WarriorServiceImpl.java
Fixed warrior server query on requesting key