commit
Merge pull request #1 from paradix/master

Latest Yohan's fixes
commit to github
Merge commit '2476afbda84f9299dcb391ed8c2832e4b7772d4c' into origin

Conflicts:
	720p/includes.xml
Merge branch 'origin' into Frodo_customFanart