CMake file add
change TODO

Signed-off-by: Yakov Goldberg <yakov.g@samsung.com>
call for  manager_init()/ manager_shutdown() in different places

Signed-off-by: Yakov Goldberg <yakov.g@samsung.com>
Merge branch 'develop': add TODO and small fix