update

hic
Merge branch 'master' of https://github.com/jvinhit/truyenvoz

Conflicts:
	truyen.xml
Merge branch 'master' of https://github.com/jvinhit/truyenvoz