Changed deployment to test server
Merge branch 'develop'