Tweaked deployment files
Merge branch 'development'