fixes i do not know
Merge branch 'master' of github.com:kevinriver/gyt

Conflicts:
	application/controllers/weixin.php