Replaced json with yaml, removed TODO file, removed old stuff
Merge branch 'develop' into integration

* develop:
  Replaced json with yaml, removed TODO file, removed old stuff