Ready to be committed
Code formatting and cleanup
Don't echo html, use admin ajax for preview action. Fix watermarking through media admin, fix generating preview loading message.
Introduce private static getDefaultArgs and pass defaults through a f…
…ilter, also add filters to setArgs and actions pre and post resize and move watermarking code to separate file hooked in at the correct places.
Fix padding and force inline preview to be nocache
Fix bug when saving crop from position
Pass post_image args through a filter.
Apply watermarks to post thumbnails.
Ability to disable watermarking functionality in settings.
Only show watermarking options for images.
Merge branch 'refs/heads/master' into watermarking