Remove redirect to dist folder
Merge branch 'development'