deleted env
templates
database updates
Merge branch 'development'