Code cleaning
Matrix fine tune
Merge branch 'master' of https://github.com/orkan/sluk-html-prev.git

Conflicts:
	index.php