Moved icon
Merge branch 'current' of https://github.com/marketboomer/nunchaku into current_nadia

Conflicts:
	app/helpers/nunchaku/resources_button_helper.rb
got rid of conflict
Merge pull request #84 from marketboomer/current_nadia

Moved icon helper out of inventory into nunchaku.
Merge pull request #86 from marketboomer/richard

Much faster sort method for use with sorted and acts_as_list gems.
fix rendering in summary helper
Merge pull request #87 from marketboomer/ratjens

fix rendering in summary helper
some basic styling for collection check boxes
a little styling and localisations for supply invoices
Merge pull request #88 from marketboomer/ratjens

styling and localisations
Get page title depending on engine
Get page title depending on engine
Merge pull request #89 from marketboomer/stable_danny

Get page title depending on engine
Fixed the disappearing new button and breadcrumb.
Merge pull request #90 from marketboomer/stable_nadia

TO STABLE: Fixed the disappearing new button and breadcrumb.
disable unused gem "Chosen-rails"
Merge branch 'master' of https://github.com/marketboomer/nunchaku into current
Merge branch 'master' into ratjens
Merge branch 'current' into ratjens
before calling the summary partial from the helper, decorate the passed-in resource