Correction Fadeout FFX
Merge branch 'master' into subpage

Conflicts:
	styles/main.min.css