Dev: latest changes
Merge branch 'development'
deleted stuff
Merge branch 'development'