Merge branch 'master' of https://github.com/smallneko/tzjeefjalft-TravelCenter into dev

Conflicts:
	src/main/java/com/tz/travel/rest/UserInfoService.java