Merge pull request #126 in ASAPO/asapo from feature_ASAPO-124-rename-company to develop

* commit '06150966':
  change order in arguments in some functions
  get rid of default stream in C++
  change ack functions
  change signature of set_lastread_marker
  fix win
  fix tests
  renamed stuff to dataset_substream
  fix tests
  more changes, increase timeout in test
  more renames
  set default delay
  switch to ms
  rename broker -> consumer in APIs
  fix tests
  rename substream to stream
  fix tests
  replace in tests
  start renaming stream to data source