NEW ALKOON COPY
Merge branch 'master' into ALKOON

Conflicts:
	index.php
everyone is the same
ready ALKOON
ALKOON LOCAL VERSION
TE
Correct and merge