Merge branch 'master' into video
treef5df5c8c4a509000c7812561d15ebfef120df04b
-rw-r--r-- 154 CMakeLists.txt
-rw-r--r-- 531 README
drwxr-xr-x - design
drwxr-xr-x - include
drwxr-xr-x - kworship
drwxr-xr-x - kworshipdisplay
drwxr-xr-x - kworshipserver
drwxr-xr-x - unipresent