Fixed login bug
Merge branch 'master' of github.com:smitparaggua/thesis-clean

Conflicts:
	raydotcom/src/main/java/com/csg/warrior/raydotcom/service/WarriorService.java
	raydotcom/src/main/java/com/csg/warrior/raydotcom/service/impl/WarriorServiceImpl.java