Merge pull request #771 from WildMeOrg/fix_watermark_for_docker

Make sure watermark reference uses dockerized path

src/main/resources/bundles/commonConfiguration.properties

@@ -407,7 +407,7 @@ imageResizeMaintainAspectCommand = /usr/bin/convert -strip -auto-orient -quality
 ############ http://www.narf.ssji.net/~shtrom/wiki/tips/imagemanipulation for comments???
 #convert /home/jon/sito_backup/web/test/fluke.jpg -set comment 'foo bar' -font Verdana-Normal -pointsize 13 -gravity NorthEast -fill white -undercolor '#00000030' -annotate +20+20 'Hello World' /var/lib/tomcat7/webapps/uptest/images/test.jpg
 
-imageWatermarkCommand = /usr/bin/convert -strip -auto-orient -quality 70 -resize %widthx%height^ %imagesource -gravity center -crop %widthx%height+0+0  -gravity Center /var/lib/tomcat8/webapps/wildbook/images/watermark.png -compose Over -composite -set comment %comment %imagetarget
+imageWatermarkCommand = /usr/bin/convert -strip -auto-orient -quality 70 -resize %widthx%height^ %imagesource -gravity center -crop %widthx%height+0+0  -gravity Center /usr/local/tomcat/webapps/wildbook/images/watermark.png -compose Over -composite -set comment %comment %imagetarget
 
 ####(broken???)####imageTransformCommand = /usr/bin/convert %imagesource -matte -virtual-pixel Transparent -affine '%t0,%t1,%t2,%t3,0,0' -transform +repage -gravity Center -crop %widthx%height%T4%T5 %imagetarget
 #use this: