master
demos: tidy up makefiles, fix warnings
Convert demos to primary build system
4.0-POST-CLANG-FORMAT-WEBKIT