Merge branch 'master' into 'deploy/like-stage'

delete app_conf.xml

See merge request !122
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed continuous-integration/drone/push