Creation new database
Sentry edit
Merge branch 'Database_edit' into Development

Conflicts:
	composer.json