add folder property to image
Merge branch 'master' of https://github.com/f1end/build.git

Conflicts:
	web/src/main/resources/config/database/sql/dump.sql
	web/src/main/webapp/pages/ui/region.jsp