Fixed tests on UserService
Removed files regarding MobileKey being stored in raydotcom
Merge branch 'TRIPLESLASH' of github.com:smitparaggua/thesis-clean into TRIPLESLASH
January 20, 756pm

magsisimula pa lang ako sa 3.) ng transmission notes ko
Merge branch 'TRIPLESLASH' of github.com:smitparaggua/thesis-clean into TRIPLESLASH
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
fixed conflict on SettingsActivity.java
Added login (not yet tested)
Database adjustments
Database adjustments
Database adjustments
sumasabog sa hibernate
Fixed some syntax errors (not all)
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
Fixed syntax errors
Before destroying GCM
After destroying GCM
Added target GCMSender
Merge branch 'TRIPLESLASH' of https://github.com/smitparaggua/thesis-clean into LINEDRIVE