update

Conflicts:
	.gitignore
	composer.json
	vendor/vscms/contact
	vendor/vscms/filer
	vendor/vscms/image
	vendor/vscms/menu
	vendor/vscms/page
	vendor/vscms/user
update
update