Merge branch 'master' of https://github.com/openframeworks/openFrameworks into cpp11
add clang/libc++ compat FreeImage 3.15.4

built using the new apothecary formula.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge branch 'cpp11' of github.com:openFrameworks-cpp11/openFrameworks into cpp11-examples