Merge branch 'master' into 'DEV/Akbar/master-h2-slave'

# Conflicts:
#   src/main/resources/application-dev.properties
#   src/main/resources/application-prod.properties
#   src/main/resources/application.properties

src/main/resources/application.properties

-#please define with dev-prod for profiles below
+# please define with dev-prod for profiles below
 spring.profiles.active=dev
 server.port=8082
 ddms.auth.token=Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiJ9.5BG9SEVOGo_xRhtT8IkyoSy60kPg8HM9Vpvb0TdNew4
\ No newline at end of file