updated migration files
updated Gemfile
bumped version
updated Gemfile
removed series_staement_merge_lists
updated routes
updated dummy environment files
updated spec file
updated gemspec
updated gemspec
updated Gemfile
Merge branch 'rails4' of github.com:next-l/enju_resource_merge into rails4
require enju_seed
updated Gemfile
updated dummy files
removed dummy files
removed protected_attributes
Merge branch 'rails4'

Conflicts:
	enju_resource_merge.gemspec
	spec/dummy/config/initializers/devise.rb