Fixed less
Merge branch 'master' of https://github.com/flaver12/DJFix

Conflicts:
	content_privat/upload.php
	functions/functions.php