EPG GO
Merge branch 'master' of https://github.com/quangphananh/IPTVSimple

Conflicts:
	guide.xml