fix weird count bug when calculatiung sweet ux size
Merge branch 'current' into ratjens
Merge pull request #127 from marketboomer/current_nadia

"Show more" changes - get rid of old events and re initiate them for edit boxes
Merge branch 'current' into ratjens

Conflicts:
	app/controllers/concerns/nunchaku/paginated.rb
Merge pull request #128 from marketboomer/ratjens

fix weird count bug when calculatiung sweet ux size
Refinement to ActiveRelation count estimate.
Merge pull request #129 from marketboomer/richard

Refinement to ActiveRelation count estimate.