Merge branch 'master' into ratjens
Merge branch 'current' into ratjens
use underscore in deriving engine name to make things more consistent for multi-word engine names
Merge pull request #121 from marketboomer/ratjens

use underscore in deriving engine name to make things more consistent for multi-word engine names
Merge branch 'master' of https://github.com/marketboomer/nunchaku into current
Merge branch 'master' into ratjens
Merge branch 'current' into ratjens
allow index widgets to have varying widths
Merge pull request #124 from marketboomer/ratjens

allow index widgets to have varying widths
Add union_scope as an ActiveRecord extension.
Merge branch 'stable' of github.com:marketboomer/nunchaku into richard
Merge branch 'current' of github.com:marketboomer/nunchaku into richard
Merge pull request #125 from marketboomer/richard

Add union_scope as an ActiveRecord extension.
"Show more" changes - get rid of old events and re initiate them for edit boxes
use our kaminari; ignore gemfile lock
Merge branch 'ratjens' into current
use sweet ux count for "More" links in the index table footer
Merge pull request #126 from marketboomer/ratjens

use sweet ux count for "More" links in the index table footer
Merge branch 'current' of https://github.com/marketboomer/nunchaku into current_nadia

Conflicts:
	app/controllers/concerns/nunchaku/paginated.rb
fix weird count bug when calculatiung sweet ux size