Introduce ThumbnailDimensions model to simply Image.
Merge pull request #2589 from awagener/add_thumbnail_dimensions_model

Introduce ThumbnailDimensions model to simplify Image.
Add onOpenDialog and onCloseDialog javascript to admin.js
Merge pull request #2593 from ghoppe/add-dialog-js

Add onOpenDialog and onCloseDialog javascript to admin.js
Merge branch 'master' of github.com:refinery/refinerycms
Added spec to prove user_plugins failure to update, per #2580
Issue #2580

Changed user_params to permit an array of plugins. Without this, user plugin access was not being persisted.
Remove httparty from test from 3277e67e8afb039500683f414b2df98e5e176fe9

This closes #2555
This closes #2552
Hybrid positive/negative assertion to prove image's presence
Merge branch 'master' of github.com:refinery/refinerycms
Merge branch 'master' of github.com:isaacfreeman/refinerycms into site_bar_redesign
Response to Github discussion

- removed * selectors in CSS
- lined up baseline text for links
- buttons have pixel top/bottom margins instead of em, so site bar has same visual amrgin top and bottom.