design epg table
Merge branch 'master' of https://github.com/zx1986/EPG-Collector

Conflicts:
	.gitignore