Merge branch 'master' of
https://github.com/loyalplayerzz/loyalplayer.git

Conflicts:
	LoyalWebservice/src/main/java/com/loyal/service/helper/PlayerHelper.java
Merge branch 'master' of
https://github.com/loyalplayerzz/loyalplayer.git