* fost-base 4284fdc...13d3817 (1):
  > Merge branch 'feature/json-settings' into develop