updated gemspec
bumped version
updated Gemfile
updated Gemfile
updated dummy environment files
updated dummy file
updated Gemfile
updated gemspec
updated Gemfile
require enju_seed
updated gemspec
updated dummy files
removed dummy files
removed protected_attributes
added inventory_file_params
removed inherited_resources
Merge branch 'rails4'

Conflicts:
	enju_inventory.gemspec
	lib/enju_inventory/version.rb
	spec/dummy/config/initializers/devise.rb