commit server: merger some file
Merge branch 'master' of github.com:taivu1980/seqwater

Conflicts:
	sites/default/files/styles/large/public/IMG_0358.jpg
	sites/default/files/styles/large/public/somerset_dam_reflection (1).jpg
	sites/default/files/styles/square_thumbnail/public/IMG_0358.jpg
	sites/default/files/styles/square_thumbnail/public/modules/image/sample.png
	sites/default/files/styles/square_thumbnail/public/somerset_dam_reflection (1).jpg
	sites/default/files/styles/thumbnail/public/IMG_0358.jpg
	sites/default/files/styles/thumbnail/public/somerset_dam_reflection (1).jpg