Merge branch 'staging' into 'master'

Staging

See merge request !4

build.sh

 #!/bin/bash
-git pull 
+git pull origin master
 mvn package spring-boot:repackage -Dmaven.test.skip=true