test deploy added, used on jenkins
Merge branch 'origin/dev'