Switching back to dev mode
Getting ready for production build
Merge branch 'development'