Merge branch 'hotfix/config_error' into develop

* hotfix/config_error:
  removed stray curly bracket from config
Merge branch 'hotfix/fix_api' into develop

* hotfix/fix_api:
  trying out api test
api controller test
Merge branch 'develop'

* develop:
  api controller test