Fix settings dialog in portrait

Resizing settings were wrong on fields and toolbar in the settings dialog
fix detail view in portrait mode

adjusted auto-resize masks
Add "Delete" button and adjust image preview size

There doesn't seem to be an easy way to specify a background image
*with* caps in Interface Builder, so reloading the button BG programatically.
Merge remote-tracking branch 'upstream/master'
Implemented ability to cancel the current upload operation, modified the 'Upload' button to toggle between it and a 'Cancel' button that cancels the upload operation