Added clipped image loader (unfinished).
More work on clipped image loading. Still unfinished.
Merged branch 'dev' with 'master'.