add  热点赛事
add 热点赛事
add ishot
update
update add ishot
Merge branch 'master' into lichenxing

Conflicts:
	src/main/java/com/ruyicai/mgr/controller/TjingcaiMatchesController.java
	src/main/java/com/ruyicai/mgr/mysql/domain/TjingcaiMatches.java
	src/main/webapp/WEB-INF/views/tjingcaiMatches/list.jsp