merge with master
-rwxr-xr-x 2745 CMakeLists.txt
-rwxr-xr-x 11358 LICENSE.APLv2
-rwxr-xr-x 217 NOTICE
-rw-r--r-- 66 osp-app-controls.manifest
drwxr-xr-x - packaging
drwxr-xr-x - res
drwxr-xr-x - src