fixed a few deploy issues
Merge branch 'development'