Removed shared_ptr dependency from static_image
Merge branch 'master' of github.com:halide/Halide

Conflicts:
	apps/support/static_image.h