fix weird count bug when calculatiung sweet ux size
Merge branch 'current' into ratjens
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