Work on CMakeLists for API
Merge branch 'dev' of https://github.com/OSSIA/API into dev