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.