Merge branch 'master' of https://github.com/laurentiu1981/multiuploader

Conflicts:
	multiupload/index.html
	multiupload/js/uploader.js