Merge branch 'patch-1' into 'testing'

Update .gitlab-ci.yml, change master deploymnet branch

See merge request !46
1 job for testing in 1 second (queued for 3 seconds)