Merge branch 'master' of git+ssh://gitbox/piccreate

Conflicts:
	bin/webscan
	cfg/webscan.cfg
	libs/CutyCapt/CutyCapt.cpp
	libs/CutyCapt/CutyCapt.hpp
	libs/CutyCapt/CutyCapt.o
	libs/CutyCapt/CutyCapt.pro
	libs/CutyCapt/Makefile
	libs/CutyCapt/google.jpg
	libs/CutyCapt/moc_CutyCapt.cpp
	libs/CutyCapt/moc_CutyCapt.o
	libs/CutyCapt/readme.txt

bin/webscan

@@ -181,13 +181,10 @@ wait # wait for all processes to finish before exit
 rm $OUTDIR/'beschnitten'/*-[1-9].$FORMAT
 for i in `ls $OUTDIR/'beschnitten'/`
 do
-	echo $i
-	bla=`basename $i -0.jpg`
-	blubb=`basename $bla .jpg`
+    first=`basename $i -0.jpg`
+    second=`basename $first .jpg`
+	mv $OUTDIR/'beschnitten'/$i $OUTDIR/'beschnitten'/$second.jpg
 
-	echo $blubb
-	mv $OUTDIR/'beschnitten'/$i $OUTDIR/'beschnitten'/$blubb.jpg
-	# Löscht den verschnitt aus dem output-ordner
 done