copy and delete (move is having issues)
Merge branch 'dev' of github.com:dwoodard/MediaCloud into dev

Conflicts:
	app/MC/Services/UploadCreatorService.php