Fix more merge conflicts
-rw-r--r-- 0 .cpack-workaround
-rw-r--r-- 374 .gitignore
-rwxr-xr-x 10540 BUILD.sh
-rw-r--r-- 2228 CMakeLists.txt
-rw-r--r-- 2342 Makefile
-rw-r--r-- 454 README
-rw-r--r-- 300 build-dependencies
drwxr-xr-x - common
drwxr-xr-x - confd_client
-rwxr-xr-x 1108 create_launchpad_service
drwxr-xr-x - designs
drwxr-xr-x - examples
-rw-r--r-- 591 foss.txt
drwxr-xr-x - manifest
drwxr-xr-x - models
drwxr-xr-x - rwcal
drwxr-xr-x - rwcm
drwxr-xr-x - rwlaunchpad
drwxr-xr-x - rwmon
drwxr-xr-x - rwso