PHOT-84: add images to upload and img/upload ordner; updade import.sql
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	src/main/resources/import.sql