dosreduvanje na upload
Merge branch 'master' of https://github.com/delix/SArS

Conflicts:
	upload.php
Merge branch 'master' of https://github.com/delix/SArS